From 52410e13785ac37e17f9776460e91faeb0f13bfa Mon Sep 17 00:00:00 2001 From: "Lisa M. Seelye" Date: Mon, 17 Apr 2006 11:25:31 +0000 Subject: Remove -r9 and base what should be -r9 off of -r7 and call it -r10 to make sure no one has crosscompile IUSE cruft. Package-Manager: portage-2.1_pre7-r5 --- sys-devel/distcc/ChangeLog | 8 +- sys-devel/distcc/Manifest | 18 +-- sys-devel/distcc/distcc-2.18.3-r10.ebuild | 160 +++++++++++++++++++++++ sys-devel/distcc/distcc-2.18.3-r9.ebuild | 166 ------------------------ sys-devel/distcc/files/digest-distcc-2.18.3-r10 | 3 + sys-devel/distcc/files/digest-distcc-2.18.3-r9 | 3 - 6 files changed, 179 insertions(+), 179 deletions(-) create mode 100644 sys-devel/distcc/distcc-2.18.3-r10.ebuild delete mode 100644 sys-devel/distcc/distcc-2.18.3-r9.ebuild create mode 100644 sys-devel/distcc/files/digest-distcc-2.18.3-r10 delete mode 100644 sys-devel/distcc/files/digest-distcc-2.18.3-r9 (limited to 'sys-devel/distcc') 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 +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..92c2a14d5551 100644 --- a/sys-devel/distcc/Manifest +++ b/sys-devel/distcc/Manifest @@ -1,12 +1,15 @@ -MD5 c391c037aebfc0acb6fd9a6314dae871 ChangeLog 27733 -RMD160 d72a7d1d731dd8c34587bbcfac5c71d99ec474f9 ChangeLog 27733 -SHA256 5aaeecbc8c49bc37aa7dadd2e37b72bc770397625c63475a3f57a4d1b356f6be ChangeLog 27733 +MD5 30fdf1e016c109a3f4f53f2f942e7645 ChangeLog 27931 +RMD160 c40f31fb8ece153522f13cbd248f572101c8e385 ChangeLog 27931 +SHA256 f9088cd3316cffb727c180dda4096918b490d149350afdc5d7f9ae3a1fd44d39 ChangeLog 27931 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 2649b44a91a2866945bf350369d6b5bd distcc-2.18.3-r10.ebuild 4990 +RMD160 69016637e30105626cbd1661a243a7932176cf85 distcc-2.18.3-r10.ebuild 4990 +SHA256 18e94c9d84d733f0f0dd22f40a2130bc530317749535526a59d37ff934f826b5 distcc-2.18.3-r10.ebuild 4990 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 @@ -16,9 +19,6 @@ SHA256 d468f34fd0c726ed8333b2866a7c0ac87fbf7d9c4a19634d6b4c3806359440ac distcc-2 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 07c56e1717517f1d89ad8eefc71ba418 distcc-2.18.3-r9.ebuild 5100 -RMD160 ce0ccc113d72544d789b13b3745229ebe936adbb distcc-2.18.3-r9.ebuild 5100 -SHA256 97777831927e3de3c150b22a1ee6dcf81230b7f367d099db773a9c89f2333506 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 @@ -40,6 +40,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 @@ -49,9 +52,6 @@ SHA256 933f827137637f16d86e9c138a4c1a90c2937ab93798b716ccadc71722778d06 files/di 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 diff --git a/sys-devel/distcc/distcc-2.18.3-r10.ebuild b/sys-devel/distcc/distcc-2.18.3-r10.ebuild new file mode 100644 index 000000000000..3c2c3b7c0c01 --- /dev/null +++ b/sys-devel/distcc/distcc-2.18.3-r10.ebuild @@ -0,0 +1,160 @@ +# 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-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 + +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="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 )" +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/${PN} + 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 + 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 /usr/bin/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 + + # 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/distcc-2.18.3-r9.ebuild b/sys-devel/distcc/distcc-2.18.3-r9.ebuild deleted file mode 100644 index 105db37cb3b5..000000000000 --- a/sys-devel/distcc/distcc-2.18.3-r9.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# 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-r10 b/sys-devel/distcc/files/digest-distcc-2.18.3-r10 new file mode 100644 index 000000000000..b6c6b9eec2a3 --- /dev/null +++ b/sys-devel/distcc/files/digest-distcc-2.18.3-r10 @@ -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/digest-distcc-2.18.3-r9 b/sys-devel/distcc/files/digest-distcc-2.18.3-r9 deleted file mode 100644 index b6c6b9eec2a3..000000000000 --- a/sys-devel/distcc/files/digest-distcc-2.18.3-r9 +++ /dev/null @@ -1,3 +0,0 @@ -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 -- cgit v1.2.3-65-gdbad