Version bump to 1.4.5, use kde-functions eclass rather than kde to avoid unnecessary IUSEs and dependencies, export CC and CXX to use the right compilers when doing cross-distcc, translate MAKEOPTS into scons options to use parallel building.

Package-Manager: portage-2.1_rc4-r1

5 files changed, 125 insertions, 26 deletions

diff --git a/app-i18n/skim/ChangeLog b/app-i18n/skim/ChangeLog
index 7daa94a54c27..62daac8dacfd 100644
--- a/app-i18n/skim/ChangeLog
+++ b/app-i18n/skim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/skim
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.40 2006/03/17 00:38:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.41 2006/06/04 19:40:41 flameeyes Exp $
+
+*skim-1.4.5 (04 Jun 2006)
+
+  04 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> +skim-1.4.5.ebuild:
+  Version bump to 1.4.5, use kde-functions eclass rather than kde to avoid
+  unnecessary IUSEs and dependencies, export CC and CXX to use the right
+  compilers when doing cross-distcc, translate MAKEOPTS into scons options to
+  use parallel building.
 
   17 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> skim-1.4.4.ebuild:
   Move the .desktop file in FDO's suggested directory.
diff --git a/app-i18n/skim/Manifest b/app-i18n/skim/Manifest
index 2c2278e75b43..5ba4695d7436 100644
--- a/app-i18n/skim/Manifest
+++ b/app-i18n/skim/Manifest
@@ -1,46 +1,66 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ff5c21bd3989d0a39ea2f4f6e6b838a8 ChangeLog 5513
-RMD160 990b42bb873633bee8cc41f1fe9c1c80b143edc1 ChangeLog 5513
-SHA256 ef2df5338a78a13c2304d6aeaaf20f0339f20d0ae18ee2cbc5723e8a60bfb5a9 ChangeLog 5513
-MD5 c91303045f74536acab4c1acb4ab9e30 files/digest-skim-1.2.3 64
-RMD160 ffe971ddd4842a9f528b3eeea2e8a96d0cc87c8d files/digest-skim-1.2.3 64
-SHA256 828550b70a488659151f3e62ac966512375a49175a06eb576d4d34879d16d563 files/digest-skim-1.2.3 64
-MD5 421d42ba961204816564723772d95f45 files/digest-skim-1.4.1 64
-RMD160 b411a20b2c530f54c33edb18f7a8982fe0604ff4 files/digest-skim-1.4.1 64
-SHA256 d3c4a7b71908d24daac1c870ca8a4f78df36d79e0126d538e9e8e81582607d2e files/digest-skim-1.4.1 64
-MD5 21de6c894faa7a998f12c927a0ecf32e files/digest-skim-1.4.2 64
-RMD160 12ce30c8ba54ef39254b41ce848886a1c2d05eb9 files/digest-skim-1.4.2 64
-SHA256 15a6dab7c5f9e0ae4ef7ebbaf1210e5ae21fd99d146584d993e8947f08f7c09f files/digest-skim-1.4.2 64
-MD5 0038bbe66e9ebdafe36cec75eb1ccc44 files/digest-skim-1.4.3 238
-RMD160 279483b8ea9c1936112e6048d191ba88c20517fb files/digest-skim-1.4.3 238
-SHA256 48576da8cfa5157ea9fbde788b122cc283ec664ed8fe776de1b332938cece184 files/digest-skim-1.4.3 238
-MD5 8a095391b02ecb39f46a7ed32ba88a79 files/digest-skim-1.4.4 64
-RMD160 9ff3e85f447bbec0e485425d2e6adc5c41c2e026 files/digest-skim-1.4.4 64
-SHA256 83d1533e09eb60e82963602bf380797f2605f6f2a48743b3653406ca61478ee8 files/digest-skim-1.4.4 64
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
-SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+DIST skim-1.2.3.tar.bz2 1420956
+DIST skim-1.4.1.tar.bz2 1059004
+DIST skim-1.4.2.tar.bz2 1062345
+DIST skim-1.4.3.tar.bz2 1065593 RMD160 5ef40c22e4e2a449871d273279a909c9cd9277ad SHA256 24f5c823e7ad3cef1c4baf9ad5780f69051b95e9c6d36fbc6b42825b4cbb12f1
+DIST skim-1.4.4.tar.bz2 1071174 RMD160 1001d43f32a2976e35e7bc46a04ef9c3ff1b20d9 SHA1 acecc1dd10842fb3549f98a707d93688cf3102a7 SHA256 8a3a8d3e59c685ec12760312e8c6788971c9a1b1f4820666ee8790d220b94a2e
+DIST skim-1.4.5.tar.bz2 1075918 RMD160 0ac73f48233cd85e047039d2942a9b9e2e8f2d86 SHA1 6e0ec92ab13b4d5b57ad42b34d5223c0d453fdb0 SHA256 7c7962d5b2d50a1150c04333e7bd23496cc23d9baa65ffde48f2192c85fde09d
+EBUILD skim-1.2.3.ebuild 1185 RMD160 c75965d98e688ded98e53779243add2b57c18caf SHA1 45552e5515dd9c42e34692e6067e8d487d3ac27e SHA256 e7610f43860562c89885e95c7a01b12e29e9eda1917cf61a14f670910790c46c
 MD5 c1a718dd44a9d44af5669e337935045c skim-1.2.3.ebuild 1185
 RMD160 c75965d98e688ded98e53779243add2b57c18caf skim-1.2.3.ebuild 1185
 SHA256 e7610f43860562c89885e95c7a01b12e29e9eda1917cf61a14f670910790c46c skim-1.2.3.ebuild 1185
+EBUILD skim-1.4.1.ebuild 1659 RMD160 3b7688f253fd64c843837da183f2584c25f8ed04 SHA1 a3617b3f78fab1a1b2bf73e2eda6dd485ffb4cec SHA256 33ce9643d64d42e53c3ab1ad45675100a102fccc304d994e2b790cde9b58ec22
 MD5 d0ffcfbba95e747b2847ee4044017d14 skim-1.4.1.ebuild 1659
 RMD160 3b7688f253fd64c843837da183f2584c25f8ed04 skim-1.4.1.ebuild 1659
 SHA256 33ce9643d64d42e53c3ab1ad45675100a102fccc304d994e2b790cde9b58ec22 skim-1.4.1.ebuild 1659
+EBUILD skim-1.4.2.ebuild 1659 RMD160 3fb629453517f76b84243c1c50c8b3411d442ed2 SHA1 5c9c48057aefda2773cf223786c081b4686a16c0 SHA256 a27960555f2bbbdc18bc21cc0173ddb0e7eccfd0882a029c2f8cb84f7e848839
 MD5 da4eeb83190aa6950ed0c38b263e077d skim-1.4.2.ebuild 1659
 RMD160 3fb629453517f76b84243c1c50c8b3411d442ed2 skim-1.4.2.ebuild 1659
 SHA256 a27960555f2bbbdc18bc21cc0173ddb0e7eccfd0882a029c2f8cb84f7e848839 skim-1.4.2.ebuild 1659
+EBUILD skim-1.4.3.ebuild 1457 RMD160 b67c5f70900117e84c56025dd39185a974990710 SHA1 60787dc0e7f06e85fee06445b174c481fce7db64 SHA256 c06bb73e92daef97d87512c18fd0c37af06505cde099ea99a3886f5d00e928a1
 MD5 898c28e54781b48e1ae5bd37643d6bcb skim-1.4.3.ebuild 1457
 RMD160 b67c5f70900117e84c56025dd39185a974990710 skim-1.4.3.ebuild 1457
 SHA256 c06bb73e92daef97d87512c18fd0c37af06505cde099ea99a3886f5d00e928a1 skim-1.4.3.ebuild 1457
+EBUILD skim-1.4.4.ebuild 1638 RMD160 26939e23bcfdb7444d5a097f2b9857eda156c04d SHA1 d510232f23e9ac806d77b40c79df1e820df94a0b SHA256 261561e250352d90d71fb3fa6ff7e80fcf6e28f2039baadbf08ef7fe35822f03
 MD5 57024252ea5633d335713fef65d67a7a skim-1.4.4.ebuild 1638
 RMD160 26939e23bcfdb7444d5a097f2b9857eda156c04d skim-1.4.4.ebuild 1638
 SHA256 261561e250352d90d71fb3fa6ff7e80fcf6e28f2039baadbf08ef7fe35822f03 skim-1.4.4.ebuild 1638
+EBUILD skim-1.4.5.ebuild 1881 RMD160 aaf4155ee465baa283d8a8f8299b79aaab1c5014 SHA1 5bed8e42df1c186797656a51bd88d933b0090b4e SHA256 6c1aeb3b27ef4ace4aabb67b705d1b9dc10aa8b17f2361be9dfc6c0b18c9b241
+MD5 583ecc4d6159a6b05e71826eb1a84a16 skim-1.4.5.ebuild 1881
+RMD160 aaf4155ee465baa283d8a8f8299b79aaab1c5014 skim-1.4.5.ebuild 1881
+SHA256 6c1aeb3b27ef4ace4aabb67b705d1b9dc10aa8b17f2361be9dfc6c0b18c9b241 skim-1.4.5.ebuild 1881
+MISC ChangeLog 5865 RMD160 436b2a28c7925adf39ae817b82b1d601b2b8a5de SHA1 c23d6c5362984c3ef71a1ed043950772d78c57c5 SHA256 b5619fcf3dfa1150b00f4542de8d4f65edee8d6ee22dd69b1145da08e27eb99d
+MD5 04d355a2d2e2b4b31e331ef8446478f7 ChangeLog 5865
+RMD160 436b2a28c7925adf39ae817b82b1d601b2b8a5de ChangeLog 5865
+SHA256 b5619fcf3dfa1150b00f4542de8d4f65edee8d6ee22dd69b1145da08e27eb99d ChangeLog 5865
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
+SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+MD5 c91303045f74536acab4c1acb4ab9e30 files/digest-skim-1.2.3 64
+RMD160 ffe971ddd4842a9f528b3eeea2e8a96d0cc87c8d files/digest-skim-1.2.3 64
+SHA256 828550b70a488659151f3e62ac966512375a49175a06eb576d4d34879d16d563 files/digest-skim-1.2.3 64
+MD5 421d42ba961204816564723772d95f45 files/digest-skim-1.4.1 64
+RMD160 b411a20b2c530f54c33edb18f7a8982fe0604ff4 files/digest-skim-1.4.1 64
+SHA256 d3c4a7b71908d24daac1c870ca8a4f78df36d79e0126d538e9e8e81582607d2e files/digest-skim-1.4.1 64
+MD5 21de6c894faa7a998f12c927a0ecf32e files/digest-skim-1.4.2 64
+RMD160 12ce30c8ba54ef39254b41ce848886a1c2d05eb9 files/digest-skim-1.4.2 64
+SHA256 15a6dab7c5f9e0ae4ef7ebbaf1210e5ae21fd99d146584d993e8947f08f7c09f files/digest-skim-1.4.2 64
+MD5 0038bbe66e9ebdafe36cec75eb1ccc44 files/digest-skim-1.4.3 238
+RMD160 279483b8ea9c1936112e6048d191ba88c20517fb files/digest-skim-1.4.3 238
+SHA256 48576da8cfa5157ea9fbde788b122cc283ec664ed8fe776de1b332938cece184 files/digest-skim-1.4.3 238
+MD5 d2f7eeb21941b19e59c39a7f4fcbc9ab files/digest-skim-1.4.4 238
+RMD160 4082c3629f72cf4db535b5bfe4995a2429252fa9 files/digest-skim-1.4.4 238
+SHA256 762c0178843f7f23e35da4ba7e741077643ba95695f6ac490fcb680c3a2bb0a6 files/digest-skim-1.4.4 238
+MD5 3fa64ee324a58b35b27b2200f3375286 files/digest-skim-1.4.5 238
+RMD160 268bed83038df4dfbbb0832febdecd85bd05c73c files/digest-skim-1.4.5 238
+SHA256 91055385b6da3413d1bcf920b4d229ef33f53088cefd0304ca518cd103de48b6 files/digest-skim-1.4.5 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEGgUwAiZjviIA2XgRAr1jAJsEh6YpDmoU1fMNluxrMCdB70C6+QCfdBAY
-4H3M+bqrpUfOFrxrELQ97OU=
-=vzxj
+iD8DBQFEgzdGAiZjviIA2XgRAtM8AJ9Wq2mFaj6DyHiL0btFf6s80TbwZwCeJyPw
+jJc2Kz78A1ypZ4Ej8op8TO0=
+=9XWp
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/skim/files/digest-skim-1.4.4 b/app-i18n/skim/files/digest-skim-1.4.4
index aec982afc294..a61de6559839 100644
--- a/app-i18n/skim/files/digest-skim-1.4.4
+++ b/app-i18n/skim/files/digest-skim-1.4.4
@@ -1 +1,3 @@
 MD5 fb01a32b13008112e2b866b33f602e68 skim-1.4.4.tar.bz2 1071174
+RMD160 1001d43f32a2976e35e7bc46a04ef9c3ff1b20d9 skim-1.4.4.tar.bz2 1071174
+SHA256 8a3a8d3e59c685ec12760312e8c6788971c9a1b1f4820666ee8790d220b94a2e skim-1.4.4.tar.bz2 1071174
diff --git a/app-i18n/skim/files/digest-skim-1.4.5 b/app-i18n/skim/files/digest-skim-1.4.5
new file mode 100644
index 000000000000..5858ec07d986
--- /dev/null
+++ b/app-i18n/skim/files/digest-skim-1.4.5
@@ -0,0 +1,3 @@
+MD5 35edfc72ed694c9fb3d3888edc3579e6 skim-1.4.5.tar.bz2 1075918
+RMD160 0ac73f48233cd85e047039d2942a9b9e2e8f2d86 skim-1.4.5.tar.bz2 1075918
+SHA256 7c7962d5b2d50a1150c04333e7bd23496cc23d9baa65ffde48f2192c85fde09d skim-1.4.5.tar.bz2 1075918
diff --git a/app-i18n/skim/skim-1.4.5.ebuild b/app-i18n/skim/skim-1.4.5.ebuild
new file mode 100644
index 000000000000..041cf1b78c62
--- /dev/null
+++ b/app-i18n/skim/skim-1.4.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2000-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.4.5.ebuild,v 1.1 2006/06/04 19:40:41 flameeyes Exp $
+
+inherit kde-functions multilib toolchain-funcs
+
+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="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="|| ( >=app-i18n/scim-1.3.3 >=app-i18n/scim-cvs-1.3.3 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+need-kde 3.2
+
+src_compile() {
+	local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
+	[[ ${MAKEOPTS/-s/} != ${MAKEOPTS} ]] && sconsopts="${sconsopts} -s"
+
+	tc-export CC CXX
+
+	CFLAGS="${CXXFLAGS}" ./configure prefix=/usr libdir=/usr/$(get_libdir) || die
+	CFLAGS="${CXXFLAGS}" ./scons ${sconsopts} || die
+}
+
+src_install() {
+	DESTDIR=${D} ./scons prefix=/usr install || die
+	mv ${D}/usr/share/doc/HTML ${D}/usr/share/doc/${PF}/html
+
+	# Install the .desktop file in FDO's suggested directory
+	dodir /usr/share/applications/kde
+	mv ${D}/usr/share/applnk/Utilities/skim.desktop \
+		${D}/usr/share/applications/kde
+}
+
+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 QT_IM_MODULE=scim'
+	einfo ' export GTK_IM_MODULE=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 QT_IM_MODULE=scim'
+	einfo ' export GTK_IM_MODULE=scim'
+	einfo '	export LC_CTYPE="zh_CN.GBK"'
+	einfo '	startkde'
+	einfo
+	einfo "and start skim and SCIM by"
+	einfo
+	einfo "	% skim -d"
+	einfo
+}