--as-needed patch to close bug 128605

(Portage version: 2.1_pre7-r5)

5 files changed, 242 insertions, 1 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 89ab55d8c5ca..ccf8cfd77f2e 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.152 2006/02/19 22:51:50 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.153 2006/04/15 16:13:48 lisa Exp $
+
+*distcc-2.18.3-r9 (15 Apr 2006)
+
+  15 Apr 2006; Lisa Seelye <lisa@gentoo.org> +files/distcc-as-needed.patch,
+  +distcc-2.18.3-r9.ebuild:
+  --as-needed for bug 128605
 
   19 Feb 2006; Joshua Kinard <kumba@gentoo.org> distcc-2.18.3-r7.ebuild:
   Marked stable on mips.
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 78d51909f9c0..bad553f9e534 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,20 +1,69 @@
 MD5 8c26f5a8c25cea3ec619f318f02a6194 ChangeLog 27567
+RMD160 975e299aa801b7ffa82ea401bf696bb22d5b8a23 ChangeLog 27567
+SHA256 a20dfaf5c8acd29e527422016681d48dfef11c60bda3453430429f9dc020ff8f ChangeLog 27567
 MD5 02847d17d77f9fa6b67c232400108e44 distcc-2.16-r2.ebuild 4856
+RMD160 83a540837aef7a978fc1df2bfe4cf3e5333871ea distcc-2.16-r2.ebuild 4856
+SHA256 9e96dba3ee23ed93ef07cf641dd55705af1ff5ce2e138161d8d6d90a09fae102 distcc-2.16-r2.ebuild 4856
 MD5 4dcddb685b2174d4bb5f037de2a34d1a distcc-2.16-r3.ebuild 5174
+RMD160 d1564acf9e230bc77f5de13cf66f13f23a27bb63 distcc-2.16-r3.ebuild 5174
+SHA256 265525f76230663ef5c10188ed2840a04657116cadbadfbe4bf19dedaaf97717 distcc-2.16-r3.ebuild 5174
 MD5 64e0afe30accc560225a5c48fc49119d distcc-2.18.3-r6.ebuild 4593
+RMD160 3d0a7c620e60ac57a6613934969fcd8e600ee3f4 distcc-2.18.3-r6.ebuild 4593
+SHA256 d73a0d3d6d584ed16b6ca87c35ee4bde50a0cfe3e69b8ddfaf938ede5a85549c distcc-2.18.3-r6.ebuild 4593
 MD5 2503b14fb10fab1fa6e0095e6b489f7d distcc-2.18.3-r7.ebuild 4907
+RMD160 b848fc3c458e7c5158782bb92911d7a763a0b363 distcc-2.18.3-r7.ebuild 4907
+SHA256 d468f34fd0c726ed8333b2866a7c0ac87fbf7d9c4a19634d6b4c3806359440ac distcc-2.18.3-r7.ebuild 4907
 MD5 94b1faf946a456fcab1ccf9b57d3494e distcc-2.18.3-r8.ebuild 5016
+RMD160 d5733383dbc54699ff2d2fd7987991d4508f8c1b distcc-2.18.3-r8.ebuild 5016
+SHA256 83602aa9aca10059f9a721bb3640778b81d0d87a1a85b41e5b2cd98310ec4480 distcc-2.18.3-r8.ebuild 5016
+MD5 bf84a3ee878fcda2a63a39aa9c928cff distcc-2.18.3-r9.ebuild 5100
+RMD160 5080459453d80c48ced6e11f79f8a853a87f9302 distcc-2.18.3-r9.ebuild 5100
+SHA256 919fde3ac8c31d60b4249c16e78558caf983d2e81f37558c50f056c0a1a646e5 distcc-2.18.3-r9.ebuild 5100
 MD5 5affcf06208bcb7b093812c299a7d9d5 files/2.17/conf 1200
+RMD160 3f2da45b4e167ac353d51f689edf982b4d82f1a3 files/2.17/conf 1200
+SHA256 2eac049781f3b7503b1c639abb9e7ba7f95ce6f68a4d081e18c98615323882ea files/2.17/conf 1200
 MD5 1161999a5d25185f95a8c284bd7307d1 files/2.17/init 733
+RMD160 0697a9a4305556f64a97ee8a3e04d956a67729e3 files/2.17/init 733
+SHA256 20e0bfe6c7d93a17bb8166e4e04572c8ee7f1b2f5e7b660229fc1bc5dbe57fdf files/2.17/init 733
 MD5 58d1985f9622690220b9eaddf1ea0039 files/2.18/conf 1267
+RMD160 a12045786088255c9bc8f4ad826928c00efac567 files/2.18/conf 1267
+SHA256 51365685f2f02c6f2846e4b35ed1ae3628999ed5035af3ad0c7b2d68acfe7c3d files/2.18/conf 1267
 MD5 601b451b5d2555281660ee7f96562dbd files/2.18/distcc-config.patch 1200
+RMD160 46adf137db41c3278463125caeb132b9626ead54 files/2.18/distcc-config.patch 1200
+SHA256 0abca6ee532de72ef19f1b210a09bd661ea7110cf36654c8c8ac016ee6573e55 files/2.18/distcc-config.patch 1200
 MD5 739ebfc62fe125b76021cf7987a158f7 files/2.18/init 733
+RMD160 935e52d2ddfc6363f26a916666bbbc28b6fdb79b files/2.18/init 733
+SHA256 1477ab79b8be398b6acb7d44e0f0a66bb75d1918365b350b824e16b8b02af22b files/2.18/init 733
 MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16-r2 64
+RMD160 8bf0887070e8bd2379e16816a680f588f6cf7556 files/digest-distcc-2.16-r2 64
+SHA256 f236c8d2e86cb1c423928cb6a1707b6b7ba29ebbc7088468590ee4cffc56a98d files/digest-distcc-2.16-r2 64
 MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16-r3 64
+RMD160 8bf0887070e8bd2379e16816a680f588f6cf7556 files/digest-distcc-2.16-r3 64
+SHA256 f236c8d2e86cb1c423928cb6a1707b6b7ba29ebbc7088468590ee4cffc56a98d files/digest-distcc-2.16-r3 64
 MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r6 66
+RMD160 d75e839051958ae2af2cd28a74f672b2c2eaaa02 files/digest-distcc-2.18.3-r6 66
+SHA256 933f827137637f16d86e9c138a4c1a90c2937ab93798b716ccadc71722778d06 files/digest-distcc-2.18.3-r6 66
 MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r7 66
+RMD160 d75e839051958ae2af2cd28a74f672b2c2eaaa02 files/digest-distcc-2.18.3-r7 66
+SHA256 933f827137637f16d86e9c138a4c1a90c2937ab93798b716ccadc71722778d06 files/digest-distcc-2.18.3-r7 66
 MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r8 66
+RMD160 d75e839051958ae2af2cd28a74f672b2c2eaaa02 files/digest-distcc-2.18.3-r8 66
+SHA256 933f827137637f16d86e9c138a4c1a90c2937ab93798b716ccadc71722778d06 files/digest-distcc-2.18.3-r8 66
+MD5 26926294f8738c38d04eb72522388057 files/digest-distcc-2.18.3-r9 244
+RMD160 352188e1e5d7c0b7c409fe75d08db4222d693c95 files/digest-distcc-2.18.3-r9 244
+SHA256 16cd80dff3cb0d5ddccc99aa4cb46229bb277646da1bc6427337af3ee9b5c738 files/digest-distcc-2.18.3-r9 244
+MD5 7cb9f3206254d1bea996f3a302ca51e5 files/distcc-as-needed.patch 558
+RMD160 faebf24490e3dd2a5247cfb6914dc88fb7b98e35 files/distcc-as-needed.patch 558
+SHA256 9e87d3b0487ffc52ccf6362866e967dff9c2a85681175096ece11413f8c91e54 files/distcc-as-needed.patch 558
 MD5 fec77b3be8d8bd8f2d6e5a708cb35717 files/distcc-config 4874
+RMD160 07bd612fc11c785691bd56e4e7bb7994a2e4dbb8 files/distcc-config 4874
+SHA256 c6a7bb74eb235fd7896ca101c033a2e9faf80afeb7232bff3afe22f8a6268a5c files/distcc-config 4874
 MD5 ec06b50c03c5002d4df60e49b9798445 files/distcc-gentoo-multilib-r1.patch 4245
+RMD160 175cb4c2ce0e8ecb2262165b3fd9a0d89ddc7beb files/distcc-gentoo-multilib-r1.patch 4245
+SHA256 78839f7392769ab41509e84f07c36d07315d0220f7aacbb174ed1aba80b9c28d files/distcc-gentoo-multilib-r1.patch 4245
 MD5 687a622f11f457581b267ce5fb3c2721 files/distcc-gentoo-multilib.patch 3784
+RMD160 f48a3f2f8c82379c30c9da0e49aa66ba34681882 files/distcc-gentoo-multilib.patch 3784
+SHA256 d3af7a7592d0a11a35d294022b36feca2fb625e4799513bf56a79e0656278403 files/distcc-gentoo-multilib.patch 3784
 MD5 c04441917ccb5e5f9790642545c1f469 metadata.xml 375
+RMD160 c51731438e30cf1cc094028d42732d2b67f2ff24 metadata.xml 375
+SHA256 0200c9bd4dc4c5e7440975b4dbe7e3807b292b352237ddccffa30fa9096c4863 metadata.xml 375
diff --git a/sys-devel/distcc/distcc-2.18.3-r9.ebuild b/sys-devel/distcc/distcc-2.18.3-r9.ebuild
new file mode 100644
index 000000000000..105db37cb3b5
--- /dev/null
+++ b/sys-devel/distcc/distcc-2.18.3-r9.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r9.ebuild,v 1.1 2006/04/15 16:13:48 lisa Exp $
+
+# If you change this in any way please email lisa@gentoo.org and make an
+# entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
+
+inherit eutils flag-o-matic gnuconfig toolchain-funcs
+
+PATCHLEVEL="2.18"
+
+DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
+HOMEPAGE="http://distcc.samba.org/"
+SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+IUSE="crosscompile gnome gtk ipv6 selinux"
+
+DEPEND=">=sys-apps/portage-2.0.49-r6
+	>=sys-devel/gcc-config-1.3.1
+	sys-apps/shadow
+	gnome? (
+	  dev-util/pkgconfig
+	)
+	gtk? (
+	  dev-util/pkgconfig
+	)"
+RDEPEND="
+	gnome? (
+		>=x11-libs/gtk+-2.0.0
+		>=gnome-base/libgnome-2.0.0
+		>=gnome-base/libgnomeui-2.0.0.0
+		>=gnome-base/libglade-2.0.0
+		x11-libs/pango
+		>=gnome-base/gconf-2.0.0
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.0.0
+		x11-libs/pango
+	)
+	selinux? ( sec-policy/selinux-distcc )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# -Wl,--as-needed to close bug #128605
+	epatch ${FILESDIR}/distcc-as-needed.patch
+
+	# See bug #75420 for more multilib stuff
+	epatch ${FILESDIR}/distcc-gentoo-multilib-r1.patch
+	einfo "Please report to bug #75420 success or failure of this patch."
+	gnuconfig_update
+}
+
+src_compile() {
+	local myconf="--with-included-popt "
+	#Here we use the built in parse-options package. saves a dependancy
+
+	#not taking any chances here, guessing which takes precedence in the 
+	#configure script, so we'll just make the distinction here:
+	#gnome takes precedence over gtk if both are specified (gnome pulls
+	#in gtk anyways...)
+	use gtk && ! use gnome && myconf="${myconf} --with-gtk"
+	use gtk && use gnome && myconf="${myconf} --with-gnome"
+
+	#More legacy stuff?
+	[ `gcc-major-version` -eq 2 ] && filter-lfs-flags
+
+	if use ipv6; then
+		ewarn "To use IPV6 you must have IPV6 compiled into your kernel"
+		ewarn "either via a module or compiled code"
+		ewarn "You can recompile without ipv6 with: USE='-ipv6' emerge distcc"
+		myconf=" ${myconf} --enable-rfc2553 "
+		epause 5
+	fi
+	econf ${myconf} || die "econf ${myconf} failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D%/}" install
+
+	insinto /usr/share/doc/${PF}
+	doins "${S}/survey.txt"
+
+	exeinto /usr/bin
+	doexe "${FILESDIR}/distcc-config"
+
+	insinto /etc/conf.d
+	newins "${FILESDIR}/${PATCHLEVEL}/conf" distccd
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/${PATCHLEVEL}/init" distccd
+
+	# create and keep the symlink dir
+	keepdir /usr/lib/distcc/bin
+
+	# create the distccd pid directory
+	keepdir /var/run/distccd
+
+	if use gnome || use gtk; then
+	  einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
+	  einfo "This is to have a little sensability in naming schemes between distccmon programs"
+	  mv ${D}/usr/bin/distccmon-gnome ${D}/usr/bin/distccmon-gui
+	  dosym distccmon-gui /usr/bin/distccmon-gnome
+	fi
+
+}
+
+pkg_preinst() {
+	# non-/ installs don't require us to do anything here
+	[ "${ROOT}" != "/" ] && return 0
+
+	# stop daemon since script is being updated
+	[ -n "$(pidof distccd)" -a -x /etc/init.d/distccd ] && \
+		/etc/init.d/distccd stop
+}
+
+pkg_postinst() {
+	#are we doing bootstrap with has no useradd?
+	if [ -x /usr/sbin/useradd ]; then
+	  enewuser distcc 240
+	else
+	  ewarn "You do not have useradd (bootstrap) from shadow so I didn't"
+	  ewarn "install the distcc user.  Note that attempting to start the daemon"
+	  ewarn "will fail. Please install shadow and re-emerge distcc."
+	  ebeep 2
+	fi
+
+	#patching distcc-config to use shell script for multi arch environments
+	use crosscompile && epatch ${FILESDIR}/2.18/distcc-config.patch
+
+	# By now everyone should be using the right envfile
+
+	if [ "${ROOT}" = "/" ]; then
+		einfo "Installing links to native compilers..."
+		/usr/bin/distcc-config --install
+	else
+		# distcc-config can *almost* handle ROOT installs itself
+		#  but for now, but user must finsh things off
+		ewarn "*** Installation is not complete ***"
+		ewarn "You must run the following as root:"
+		ewarn "  /usr/bin/distcc-config --install"
+		ewarn "after booting or chrooting into ${ROOT}"
+	fi
+	einfo "Setting permissions on ${ROOT}var/run/distccd"
+	chown -R distcc:daemon ${ROOT}var/run/distccd
+	echo ""
+
+	einfo "Tips on using distcc with Gentoo can be found at"
+	einfo "http://www.gentoo.org/doc/en/distcc.xml"
+	echo ""
+	einfo "To use the distccmon programs with Gentoo you should use this command:"
+	einfo "      DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N"
+	use gnome || use gtk && einfo "Or:   DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome"
+
+	ewarn "***SECURITY NOTICE***"
+	ewarn "If you are upgrading distcc please make sure to run etc-update to"
+	ewarn "update your /etc/conf.d/distccd and /etc/init.d/distccd files with"
+	ewarn "added security precautions (the --listen and --allow directives)"
+	ebeep 5
+}
diff --git a/sys-devel/distcc/files/digest-distcc-2.18.3-r9 b/sys-devel/distcc/files/digest-distcc-2.18.3-r9
new file mode 100644
index 000000000000..b6c6b9eec2a3
--- /dev/null
+++ b/sys-devel/distcc/files/digest-distcc-2.18.3-r9
@@ -0,0 +1,3 @@
+MD5 0d6b80a1efc3a3d816c4f4175f63eaa2 distcc-2.18.3.tar.bz2 341601
+RMD160 c7ac6f3e161dccf39b841b57a3328b4208d28c2d distcc-2.18.3.tar.bz2 341601
+SHA256 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434 distcc-2.18.3.tar.bz2 341601
diff --git a/sys-devel/distcc/files/distcc-as-needed.patch b/sys-devel/distcc/files/distcc-as-needed.patch
new file mode 100644
index 000000000000..6678e4d78d1a
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-as-needed.patch
@@ -0,0 +1,17 @@
+Index: distcc-2.18.3/Makefile.in
+===================================================================
+--- distcc-2.18.3.orig/Makefile.in
++++ distcc-2.18.3/Makefile.in
+@@ -377,9 +377,9 @@ src/renderer.o: src/renderer.c
+ 		$(srcdir)/src/renderer.c
+ 
+ distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj)
+-	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS)	\
+-		$(GNOME_CFLAGS) $(GNOME_LIBS)			\
+-		$(mon_obj) $(gnome_obj)
++	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
++		$(mon_obj) $(gnome_obj) \
++		$(LIBS) $(GNOME_CFLAGS) $(GNOME_LIBS)
+ 
+ 
+ ## Dist targets