Fixed parallel make issue, bug #253611.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 15 insertions, 174 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/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
 }