Remove -r9 and base what should be -r9 off of -r7 and call it -r10 to make sure no one has crosscompile IUSE cruft.

(Portage version: 2.1_pre7-r5)

4 files changed, 22 insertions, 16 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index ccf8cfd77f2e..30f3561a4e25 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.153 2006/04/15 16:13:48 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.154 2006/04/17 11:25:31 lisa Exp $
+
+*distcc-2.18.3-r10 (17 Apr 2006)
+
+  17 Apr 2006; Lisa Seelye <lisa@gentoo.org> +distcc-2.18.3-r10.ebuild:
+  Base the new thing on -r7 and not pmasked -r8 with IUSE crosscompile. thanks
+  agaffney.
 
 *distcc-2.18.3-r9 (15 Apr 2006)
 
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 9f6da1291a86..edf06f50dea1 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -7,6 +7,9 @@ SHA256 9e96dba3ee23ed93ef07cf641dd55705af1ff5ce2e138161d8d6d90a09fae102 distcc-2
 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 709d504eb6f732926f3742894fa46be0 distcc-2.18.3-r10.ebuild 4991
+RMD160 323a253da4891c9c2310eea3d1b55ed15d9ce0dc distcc-2.18.3-r10.ebuild 4991
+SHA256 80d6f1a0f5b6628f61dfba7a9741f75da755fa49cc4c4214c8620afbc4b87842 distcc-2.18.3-r10.ebuild 4991
 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
@@ -40,6 +43,9 @@ SHA256 f236c8d2e86cb1c423928cb6a1707b6b7ba29ebbc7088468590ee4cffc56a98d files/di
 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 26926294f8738c38d04eb72522388057 files/digest-distcc-2.18.3-r10 244
+RMD160 352188e1e5d7c0b7c409fe75d08db4222d693c95 files/digest-distcc-2.18.3-r10 244
+SHA256 16cd80dff3cb0d5ddccc99aa4cb46229bb277646da1bc6427337af3ee9b5c738 files/digest-distcc-2.18.3-r10 244
 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
diff --git a/sys-devel/distcc/distcc-2.18.3-r9.ebuild b/sys-devel/distcc/distcc-2.18.3-r10.ebuild
index 105db37cb3b5..3c2c3b7c0c01 100644
--- a/sys-devel/distcc/distcc-2.18.3-r9.ebuild
+++ b/sys-devel/distcc/distcc-2.18.3-r10.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r10.ebuild,v 1.1 2006/04/17 11:25:31 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
@@ -15,19 +15,14 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE="gnome gtk selinux ipv6"
 
 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
-	)"
+	gnome? ( dev-util/pkgconfig )
+	gtk? ( dev-util/pkgconfig )"
 RDEPEND="
 	gnome? (
 		>=x11-libs/gtk+-2.0.0
@@ -84,7 +79,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D%/}" install
 
-	insinto /usr/share/doc/${PF}
+	insinto /usr/share/doc/${PN}
 	doins "${S}/survey.txt"
 
 	exeinto /usr/bin
@@ -97,16 +92,18 @@ src_install() {
 	newexe "${FILESDIR}/${PATCHLEVEL}/init" distccd
 
 	# create and keep the symlink dir
+	dodir /usr/lib/distcc/bin
 	keepdir /usr/lib/distcc/bin
 
 	# create the distccd pid directory
+	dodir /var/run/distccd
 	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
+	  dosym /usr/bin/distccmon-gui /usr/bin/distccmon-gnome
 	fi
 
 }
@@ -131,9 +128,6 @@ pkg_postinst() {
 	  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
diff --git a/sys-devel/distcc/files/digest-distcc-2.18.3-r9 b/sys-devel/distcc/files/digest-distcc-2.18.3-r10
index b6c6b9eec2a3..b6c6b9eec2a3 100644
--- a/sys-devel/distcc/files/digest-distcc-2.18.3-r9
+++ b/sys-devel/distcc/files/digest-distcc-2.18.3-r10