Fixed problem reported in bug #83071. Parallel build broken bug #121089, workaround added.

Package-Manager: portage-2.0.54

4 files changed, 108 insertions, 2 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index 120f45ac8d45..26b35dca1f36 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/sim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.51 2006/01/31 13:51:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.52 2006/01/31 22:25:11 pva Exp $
+
+*sim-0.9.4_pre060131-r1 (31 Jan 2006)
+
+  31 Jan 2006; Peter Volkov <pva@gentoo.org> +sim-0.9.4_pre060131-r1.ebuild:
+  Fixed problem reported in bug #83071. Parallel build broken bug #121089,
+  workaround added.
 
 *sim-0.9.4_pre060131 (31 Jan 2006)
 
diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest
index 51d3742f4257..d7a74b3736ed 100644
--- a/net-im/sim/Manifest
+++ b/net-im/sim/Manifest
@@ -1,6 +1,8 @@
-MD5 6c83538aa845d7f225b55ce28953337c ChangeLog 7961
+MD5 4b770cf55552993f8423fc6ba4400982 ChangeLog 8173
 MD5 7c72226f8c4698dd4677e190f3e5581b files/digest-sim-0.9.4_pre060114 64
 MD5 5a5833d23169d51933f376329be11d63 files/digest-sim-0.9.4_pre060131 64
+MD5 5a5833d23169d51933f376329be11d63 files/digest-sim-0.9.4_pre060131-r1 64
 MD5 3af162e57508c83727e10edddce8117b metadata.xml 507
 MD5 f3fea47c0c8bcfa73d0fd0dd7872a972 sim-0.9.4_pre060114.ebuild 3326
+MD5 382b81e98cc8c249a4a0d42e9f20df42 sim-0.9.4_pre060131-r1.ebuild 2581
 MD5 623ce869dee3d24618a0a406604b4b86 sim-0.9.4_pre060131.ebuild 2555
diff --git a/net-im/sim/files/digest-sim-0.9.4_pre060131-r1 b/net-im/sim/files/digest-sim-0.9.4_pre060131-r1
new file mode 100644
index 000000000000..1a10b2bdd55b
--- /dev/null
+++ b/net-im/sim/files/digest-sim-0.9.4_pre060131-r1
@@ -0,0 +1 @@
+MD5 f076bb8297d8e7bec6530638b55c78e6 sim-060131.tar.bz2 4641738
diff --git a/net-im/sim/sim-0.9.4_pre060131-r1.ebuild b/net-im/sim/sim-0.9.4_pre060131-r1.ebuild
new file mode 100644
index 000000000000..48ad8c1359e7
--- /dev/null
+++ b/net-im/sim/sim-0.9.4_pre060131-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4_pre060131-r1.ebuild,v 1.1 2006/01/31 22:25:11 pva Exp $
+
+inherit kde-functions eutils debug flag-o-matic libtool
+
+myver=${PV##*_pre}
+
+DESCRIPTION="Simple Instant Messenger (with KDE support). ICQ/AIM/Jabber/MSN/Yahoo."
+HOMEPAGE="http://developer.berlios.de/projects/sim-im/"
+#SRC_URI="http://developer.berlios.de/projects/sim-im/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${PN}-${myver}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="kde spell ssl"
+
+# kdebase-data provides the icon "licq.png"
+RDEPEND="kde? ( kde-base/kdelibs
+			    || ( kde-base/kdebase-data kde-base/kdebase ) )
+		 !kde? ( $(qt_min_version 3)
+		         spell? ( app-text/aspell ) )
+		 ssl? ( dev-libs/openssl )
+		 dev-libs/libxml2
+		 dev-libs/libxslt"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	app-arch/zip"
+
+S=${WORKDIR}/${PN}-${myver}
+
+pkg_setup() {
+	if [ -n ${myver} ] ; then
+		ewarn "Building svn version exported on ${myver}."
+	fi
+	if use kde ; then
+		if use spell; then
+			if ! built_with_use kde-base/kdelibs spell ; then
+				ewarn "kde-base/kdelibs were merged without spell in USE."
+				ewarn "Thus spelling will not work in sim. Please, either"
+				ewarn "reemerge kde-base/kdelibs with spell in USE or emerge"
+				ewarn 'sim with USE="-spell" to avoid this message.'
+				ebeep
+			fi
+		else
+			if built_with_use kde-base/kdelibs spell ; then
+				ewarn 'kde-base/kdelibs were merged with spell in USE.'
+				ewarn 'Thus spelling will work in sim. Please, either'
+				ewarn 'reemerge kde-base/kdelibs without spell in USE or emerge'
+				ewarn 'sim with USE="spell" to avoid this message.'
+				ebeep
+			fi
+		fi
+		if ! built_with_use kde-base/kdelibs arts ; then
+			myconf="--without-arts"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	need-autoconf 2.5
+	need-automake 1.7
+
+	if use kde ; then
+		set-kdedir 3
+	fi
+
+	make -f admin/Makefile.common || die "Failed to create Makefiles..."
+	elibtoolize --reverse-deps
+}
+
+src_compile() {
+	filter-flags -fstack-protector -fstack-protector-all
+
+	# Workaround for bug #119906
+	append-flags -fno-stack-protector
+
+	if ! use kde ; then
+		use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell"
+	fi
+
+	econf --exec-prefix=/usr ${myconf} `use_enable kde` \
+		  `use_with ssl` \
+		  `use_enable debug` || die "econf failed"
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed."
+	dodoc TODO README AUTHORS.sim ChangeLog AUTHORS
+}