Fixed parallel make issue, bug #253611.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 17 insertions, 178 deletions

diff --git a/app-i18n/skim/ChangeLog b/app-i18n/skim/ChangeLog
index 0c4844641970..4271ed21393b 100644
--- a/app-i18n/skim/ChangeLog
+++ b/app-i18n/skim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/skim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.71 2009/07/21 00:49:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.72 2009/07/22 15:31:46 matsuu Exp $
+
+  22 Jul 2009; MATSUU Takuto <matsuu@gentoo.org> -skim-1.4.5-r3.ebuild,
+  -skim-1.4.5-r4.ebuild, skim-1.4.5-r5.ebuild:
+  Fixed parallel make issue, bug #253611.
 
   21 Jul 2009; Jeroen Roovers <jer@gentoo.org> skim-1.4.5-r5.ebuild:
   Stable for HPPA (bug #277353).
diff --git a/app-i18n/skim/Manifest b/app-i18n/skim/Manifest
index 6769f9069aa6..41d1b2f0c9b2 100644
--- a/app-i18n/skim/Manifest
+++ b/app-i18n/skim/Manifest
@@ -5,9 +5,7 @@ AUX skim-1.4.5-python26-2.patch 597 RMD160 d52c10848d3f1d4fdf7da299fddc28f1e0f1a
 AUX skim-1.4.5-python26.patch 534 RMD160 d5090fe477de31b19296c2d22e223e0c97c2046a SHA1 9e256589b6e1ed81c4b5576f346837a57d936fce SHA256 227b55a23a3f68ee5c38403bff78bb5d795b97ecffc1235be16470b4a922c086
 DIST skim-1.4.5.tar.bz2 1075918 RMD160 0ac73f48233cd85e047039d2942a9b9e2e8f2d86 SHA1 6e0ec92ab13b4d5b57ad42b34d5223c0d453fdb0 SHA256 7c7962d5b2d50a1150c04333e7bd23496cc23d9baa65ffde48f2192c85fde09d
 EBUILD skim-1.4.5-r2.ebuild 2232 RMD160 66a0c27a3e8e8fd47ac7ce7c65ffb68efb4e4aef SHA1 f7f3891bf38e4199582f2517da2e2d03e9b8bfa1 SHA256 0415401cbd2d201a00be4099eef67bf8502968a8a20d32c3ff3c253235cafba2
-EBUILD skim-1.4.5-r3.ebuild 2345 RMD160 57b1068b055602db5d0f7708d2aefbe06b1058dc SHA1 7799946ee434d21600d1554c0ee08b8764565476 SHA256 3d81d9d5b3379c452f2a6f66dd0f27a63f0b46998f2054704dc0a0dc222e6335
-EBUILD skim-1.4.5-r4.ebuild 2303 RMD160 9c0f492695619de9e4aa9ad814475ba95bcc4e78 SHA1 3e88b0e429aee125017828088778c33d165915bd SHA256 3d0a6049040e20be6f6d0210eeb7668be0017d42a615202a7ed623a768f47720
-EBUILD skim-1.4.5-r5.ebuild 2341 RMD160 a8907a7bae68aa0f5edbf4c9108ff0979dde2acf SHA1 ceb36d11e5e34f72fcb20af6bc3db92eec2010d4 SHA256 da99bea158383c1d759dc32719c45bd002808d6d3f55d5889d5bc72341d84700
+EBUILD skim-1.4.5-r5.ebuild 2513 RMD160 616b416f7276cb4b05615620136f97ff39f6c781 SHA1 3eca0df0bde927668f96cd4d64ea638e30f1ae45 SHA256 e7d158df5d93569cf3c9cd1bdfebadec4f0fd1fd62083b4d7c5747abc86471cd
 EBUILD skim-1.4.5.ebuild 2025 RMD160 cfc35810fe9160f813483a227c1a84c3f440cb5e SHA1 9677f7acb7ca4e9a787e024f2fda63aba305fe62 SHA256 f1678c165786d1c2fc2374ae6b3c34b7b9bd4d2c460f15b64867f55b47317465
-MISC ChangeLog 9553 RMD160 0d089040be28f603096f1fb2f7d991d5590c7efd SHA1 7112aff53297cb6faea19ffd2d84b58258d676dc SHA256 33c22a4c53068aabe2cc7913eaf512f4cbc7716a0bbb081491f41c4846fd17d0
+MISC ChangeLog 9718 RMD160 70e54917cc8f87484ad91067c930e38c5d13dde5 SHA1 70460140b7084163a3c49f63acf12dba0e541f55 SHA256 2ccdeab69f46cf5f0621c0a23c640d33bb9d73b70b1226d51e48edf42f05902e
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/skim/skim-1.4.5-r3.ebuild b/app-i18n/skim/skim-1.4.5-r3.ebuild
deleted file mode 100644
index 9395820b81e0..000000000000
--- a/app-i18n/skim/skim-1.4.5-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2000-2009 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-r3.ebuild,v 1.1 2009/01/29 14:29:25 matsuu Exp $
-
-inherit kde-functions multilib toolchain-funcs eutils
-
-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="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-i18n/scim-1.4.4"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-need-kde 3.2
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	# bug #211493
-	epatch "${FILESDIR}/${P}-kde3.patch"
-	#
-	epatch "${FILESDIR}/${P}-klineedit.patch"
-
-	sed -i -e "s:/opt/kde3:${KDEDIR}:g" doc/de/index.docbook || die
-	# bug #246223
-	ln -s libscim-kdeutils.so.0.1.0 utils/libscim-kdeutils.so || die
-}
-
-src_compile() {
-	local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
-	[ "${MAKEOPTS/-s/}" != "${MAKEOPTS}" ] && sconsopts="${sconsopts} -s"
-
-	./configure prefix=/usr libdir=/usr/$(get_libdir) || die
-	# bug #255210
-	epatch "${FILESDIR}/${P}-python26.patch"
-	sed -i -e "/^compilers/s:\[:\['$(tc-getCXX)',:" scons-local-0.96.1/SCons/Tool/g++.py || die
-	./scons ${sconsopts} || die
-}
-
-src_install() {
-	DESTDIR="${D}" ./scons prefix=/usr install || die
-
-	# 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"
-
-	dodoc ChangeLog AUTHORS NEWS README TODO
-	mv "${D}/usr/share/doc/HTML" "${D}/usr/share/doc/${PF}/html"
-}
-
-pkg_postinst() {
-	elog
-	elog "If you want to use Chinese interface, edit your startup script"
-	elog "such as .xinitrc to incorporate"
-	elog
-	elog '	export XMODIFIERS=@im=SCIM'
-	elog ' export QT_IM_MODULE=scim'
-	elog ' export GTK_IM_MODULE=scim'
-	elog '	export LANG="zh_CN.GBK"'
-	elog '	startkde'
-	elog
-	elog "or if you prefer English interface,"
-	elog
-	elog '	export XMODIFIERS=@im=SCIM'
-	elog ' export QT_IM_MODULE=scim'
-	elog ' export GTK_IM_MODULE=scim'
-	elog '	export LC_CTYPE="zh_CN.GBK"'
-	elog '	startkde'
-	elog
-	elog "and start skim and SCIM by"
-	elog
-	elog "	% skim -d"
-	elog
-}
diff --git a/app-i18n/skim/skim-1.4.5-r4.ebuild b/app-i18n/skim/skim-1.4.5-r4.ebuild
deleted file mode 100644
index 1e2522d44e76..000000000000
--- a/app-i18n/skim/skim-1.4.5-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2000-2009 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-r4.ebuild,v 1.1 2009/02/14 01:22:00 matsuu Exp $
-
-inherit kde-functions multilib toolchain-funcs eutils
-
-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="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-i18n/scim-1.4.4"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-need-kde 3.2
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	# bug #211493
-	epatch "${FILESDIR}/${P}-kde3.patch"
-	#
-	epatch "${FILESDIR}/${P}-klineedit.patch"
-
-	sed -i -e "/^env =/s:(:(CXX='$(tc-getCXX)', :" SConstruct || die
-
-	sed -i -e "s:/opt/kde3:${KDEDIR}:g" doc/de/index.docbook || die
-
-	# bug #246223
-	ln -s libscim-kdeutils.so.0.1.0 utils/libscim-kdeutils.so || die
-
-	# bug #255210
-	tar xjf bksys/scons-mini.tar.bz2 || die
-	epatch "${FILESDIR}/${P}-python26.patch"
-}
-
-src_compile() {
-	local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
-	[ "${MAKEOPTS/-s/}" != "${MAKEOPTS}" ] && sconsopts="${sconsopts} -s"
-	./scons ${sconsopts} || die
-}
-
-src_install() {
-	DESTDIR="${D}" ./scons prefix=/usr install || die
-
-	# 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"
-
-	dodoc ChangeLog AUTHORS NEWS README TODO
-	mv "${D}/usr/share/doc/HTML" "${D}/usr/share/doc/${PF}/html"
-}
-
-pkg_postinst() {
-	elog
-	elog "If you want to use Chinese interface, edit your startup script"
-	elog "such as .xinitrc to incorporate"
-	elog
-	elog '	export XMODIFIERS=@im=SCIM'
-	elog ' export QT_IM_MODULE=scim'
-	elog ' export GTK_IM_MODULE=scim'
-	elog '	export LANG="zh_CN.GBK"'
-	elog '	startkde'
-	elog
-	elog "or if you prefer English interface,"
-	elog
-	elog '	export XMODIFIERS=@im=SCIM'
-	elog ' export QT_IM_MODULE=scim'
-	elog ' export GTK_IM_MODULE=scim'
-	elog '	export LC_CTYPE="zh_CN.GBK"'
-	elog '	startkde'
-	elog
-	elog "and start skim and SCIM by"
-	elog
-	elog "	% skim -d"
-	elog
-}
diff --git a/app-i18n/skim/skim-1.4.5-r5.ebuild b/app-i18n/skim/skim-1.4.5-r5.ebuild
index d5b6ec7c9a40..e341bf8f2e4a 100644
--- a/app-i18n/skim/skim-1.4.5-r5.ebuild
+++ b/app-i18n/skim/skim-1.4.5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-r5.ebuild,v 1.4 2009/07/21 00:49:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.4.5-r5.ebuild,v 1.5 2009/07/22 15:31:46 matsuu Exp $
 
 inherit kde-functions multilib toolchain-funcs eutils
 
@@ -44,8 +44,15 @@ src_unpack() {
 }
 
 src_compile() {
-	local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
-	[ "${MAKEOPTS/-s/}" != "${MAKEOPTS}" ] && sconsopts="${sconsopts} -s"
+	local sconsopts=""
+	# parallel make b0rked, bug #253611
+	#if [ "${MAKEOPTS/-j/}" != "${MAKEOPTS}" ] ; then
+	#	local jobs=$(echo "${MAKEOPTS}" | sed -e "s/.*-j[^0-9]*\([0-9]\+\).*/\1/")
+	#	sconsopts="${sconsopts} -j ${jobs}"
+	#fi
+	if [ "${MAKEOPTS/-s/}" != "${MAKEOPTS}" ] ; then
+		sconsopts="${sconsopts} -s"
+	fi
 	./scons ${sconsopts} || die
 }