Version bumped.

(Portage version: 2.0.51.22-r1)

8 files changed, 26 insertions, 73 deletions

diff --git a/app-i18n/skim/ChangeLog b/app-i18n/skim/ChangeLog
index 3b4e1de59fda..a181bde249d2 100644
--- a/app-i18n/skim/ChangeLog
+++ b/app-i18n/skim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/skim
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.29 2005/07/03 13:31:20 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.30 2005/07/18 11:00:39 usata Exp $
+
+*skim-1.4.0 (18 Jul 2005)
+
+  18 Jul 2005; Mamoru KOMACHI <usata@gentoo.org>
+  -files/skim-1.0.2-types.patch, -skim-1.2.2.ebuild, -skim-1.3.0.ebuild,
+  +skim-1.4.0.ebuild:
+  Version bumped.
 
   03 Jul 2005; Michael Hanselmann <hansmi@gentoo.org> skim-1.2.3.ebuild:
   Stable on ppc.
diff --git a/app-i18n/skim/Manifest b/app-i18n/skim/Manifest
index 56c9ed9bf503..4f0a0007f529 100644
--- a/app-i18n/skim/Manifest
+++ b/app-i18n/skim/Manifest
@@ -1,11 +1,10 @@
 MD5 c1a718dd44a9d44af5669e337935045c skim-1.2.3.ebuild 1185
-MD5 76948556132a0e9ad12529762e6826de skim-1.2.2.ebuild 1184
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 773290ca830713c9f1a246e365f87b5b ChangeLog 4085
-MD5 271f40494b5273083f772fd82ca31213 skim-1.3.0.ebuild 1134
 MD5 f4fdd703970a0cca979bef289bb569b2 skim-1.3.1.ebuild 1134
-MD5 9f3e930c55590fe519f75e387d27ae1f files/digest-skim-1.3.1 64
-MD5 1d5af0e9f04b0051301aa8ecbbe9048f files/skim-1.0.2-types.patch 739
-MD5 46b544aa0ec42d4b8a5d4a4353b655eb files/digest-skim-1.3.0 64
-MD5 8c94392eeeb767d14395bc660631c0f3 files/digest-skim-1.2.2 64
+MD5 8432af8bc6bfe8ced6d5734028f61efe skim-1.4.0.ebuild 1484
+MD5 8432af8bc6bfe8ced6d5734028f61efe skim-1.3.2.ebuild 1484
 MD5 c91303045f74536acab4c1acb4ab9e30 files/digest-skim-1.2.3 64
+MD5 4c4bb1bf8c53f6b8b5cd4ecd1fed8504 files/digest-skim-1.3.2 64
+MD5 209a989fc8cf4d26de3e7f402769e2a9 files/digest-skim-1.4.0 64
+MD5 9f3e930c55590fe519f75e387d27ae1f files/digest-skim-1.3.1 64
diff --git a/app-i18n/skim/files/digest-skim-1.2.2 b/app-i18n/skim/files/digest-skim-1.2.2
deleted file mode 100644
index 0d1d23d1f8d5..000000000000
--- a/app-i18n/skim/files/digest-skim-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ee02b5d18276637b7db1df0ec7cf1ae skim-1.2.2.tar.bz2 1420215
diff --git a/app-i18n/skim/files/digest-skim-1.3.0 b/app-i18n/skim/files/digest-skim-1.3.0
deleted file mode 100644
index b8195ee6b9a8..000000000000
--- a/app-i18n/skim/files/digest-skim-1.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b184226e951656b30d4572fb8f7c1374 skim-1.3.0.tar.bz2 1474158
diff --git a/app-i18n/skim/files/digest-skim-1.4.0 b/app-i18n/skim/files/digest-skim-1.4.0
new file mode 100644
index 000000000000..89a5bad8d298
--- /dev/null
+++ b/app-i18n/skim/files/digest-skim-1.4.0
@@ -0,0 +1 @@
+MD5 6a261a5e15e641a021732b16542ca264 skim-1.4.0.tar.bz2 1058915
diff --git a/app-i18n/skim/files/skim-1.0.2-types.patch b/app-i18n/skim/files/skim-1.0.2-types.patch
deleted file mode 100644
index 53b41015c1b8..000000000000
--- a/app-i18n/skim/files/skim-1.0.2-types.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pur skim-1.0.2/src/socketserverthread.h skim-1.0.2.patched/src/socketserverthread.h
---- skim-1.0.2/src/socketserverthread.h	2004-10-10 16:34:03.000000000 +0200
-+++ skim-1.0.2.patched/src/socketserverthread.h	2005-02-27 19:59:46.745519480 +0100
-@@ -120,7 +120,7 @@ signals:
-     void updatePreeditStringReq(const QString &, const scim::AttributeList &);
-     void updateLookupTableReq( const QStringList &, const QStringList &, 
-         QValueList<scim::AttributeList > &, int cursor,
--        unsigned page_start, unsigned candidates, unsigned & exact_item_num );
-+        int page_start, uint32 candidates, size_t & exact_item_num );
-     void showAuxStringReq();
-     void showPreeditStringReq();
-     void showStatusStringReq();
diff --git a/app-i18n/skim/skim-1.2.2.ebuild b/app-i18n/skim/skim-1.2.2.ebuild
deleted file mode 100644
index b62a7d76a051..000000000000
--- a/app-i18n/skim/skim-1.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.2.2.ebuild,v 1.4 2005/05/29 01:20:36 usata Exp $
-
-inherit kde
-
-DESCRIPTION="Smart Common Input Method (SCIM) optimized for KDE"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
-	http://freedesktop.org/~cougar/skim/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~amd64"
-IUSE=""
-
-DEPEND="|| ( >=app-i18n/scim-1.1.3 >=app-i18n/scim-cvs-1.1.3 )
-	!>=app-i18n/scim-1.3
-	!>=app-i18n/scim-cvs-1.3"
-
-need-kde 3.2
-
-src_install() {
-	kde_src_install
-
-	mv ${D}/usr/share/doc/HTML ${D}/usr/share/doc/${PF}/html
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you want to use Chinese interface, edit your startup script"
-	einfo "such as .xinitrc to incorporate"
-	einfo
-	einfo '	export XMODIFIERS=@im=SCIM'
-	einfo '	export LANG="zh_CN.GBK"'
-	einfo '	startkde'
-	einfo
-	einfo "or if you prefer English interface,"
-	einfo
-	einfo '	export XMODIFIERS=@im=SCIM'
-	einfo '	export LC_CTYPE="zh_CN.GBK"'
-	einfo '	startkde'
-	einfo
-	einfo "and start skim and SCIM by"
-	einfo
-	einfo "	% skim -d"
-	einfo
-}
diff --git a/app-i18n/skim/skim-1.3.0.ebuild b/app-i18n/skim/skim-1.4.0.ebuild
index 95817910503a..e4af8b2e94c2 100644
--- a/app-i18n/skim/skim-1.3.0.ebuild
+++ b/app-i18n/skim/skim-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.3.0.ebuild,v 1.1 2005/05/29 02:32:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.4.0.ebuild,v 1.1 2005/07/18 11:00:39 usata Exp $
 
 inherit kde
 
@@ -11,15 +11,23 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="|| ( >=app-i18n/scim-1.3 >=app-i18n/scim-cvs-1.3 )"
+DEPEND="|| ( >=app-i18n/scim-1.3.3 >=app-i18n/scim-cvs-1.3.3 )"
 
 need-kde 3.2
 
+src_compile() {
+	#sed -i -e "/=.*DESTDIR/s@\(\['DESTDIR'\]\)@\1 + '/usr'@" bksys/generic.py || die
+	#sed -i -e "/basedir =.*DESTDIR/s@\(\['DESTDIR'\]\)@\1 + '/usr'@g" bksys/generic.py || die
+	#sed -i -e "s@\(basedir+subdir\)@\1+'/usr'@g" bksys/generic.py || die
+	./configure prefix=/usr || die
+	./scons || die
+}
+
 src_install() {
-	kde_src_install
+	DESTDIR=${D} ./scons prefix=/usr install || die
 
 	mv ${D}/usr/share/doc/HTML ${D}/usr/share/doc/${PF}/html
 }