diff options
Diffstat (limited to 'sys-devel')
-rw-r--r-- | sys-devel/distcc/ChangeLog | 9 | ||||
-rw-r--r-- | sys-devel/distcc/Manifest | 13 | ||||
-rw-r--r-- | sys-devel/distcc/distcc-3.1-r7.ebuild | 176 | ||||
-rw-r--r-- | sys-devel/distcc/metadata.xml | 12 |
4 files changed, 197 insertions, 13 deletions
diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog index 036047b7a6f1..a8c3952e9fc2 100644 --- a/sys-devel/distcc/ChangeLog +++ b/sys-devel/distcc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/distcc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.217 2013/02/03 12:42:47 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.218 2013/02/03 18:59:23 jlec Exp $ + +*distcc-3.1-r7 (03 Feb 2013) + + 03 Feb 2013; Justin Lecher <jlec@gentoo.org> +distcc-3.1-r7.ebuild, + metadata.xml: + Add USE blocker between gtk and gnome, #416595; bump EAPI; move to new python + eclasses 03 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml: Cleanup due #22900 diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest index 2ab32a024203..fed000fdb152 100644 --- a/sys-devel/distcc/Manifest +++ b/sys-devel/distcc/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX 2.18-r1/conf 1345 SHA256 c48a04bd789d38682c8e1003f891a4428e5bb457696578afe56a913ec003fdef SHA512 538241a2730f6b0c942a32abf47f4cb41b8ebfbc1e8c6fc3b260c290b4cae536e282277c491da2bbd2a905c3d2758ebf507eb21ee9af9fd7529666dfddae9f5d WHIRLPOOL 9d6ced9dd30b987a1650496f6c9671e6a3006b7929035bd0ef7004dbcacaad9b21f92e736f1ba4e87bd61e615a99b8d2623f40556453a80f7aa3a0c8be56ee67 AUX 2.18-r1/init 927 SHA256 3b7343b659ce864da8b730d2bf2c221de6446d6afc935f7686d85fc8d0983167 SHA512 b31de8f3acfd3067d8c1514b48b77334770fca62c1fdbcc3c6ed13928d501a544e9a8e49341c1c5e687c4d4376dc88647b0449e9d53e039e69908ffc86991a6a WHIRLPOOL 97e9d2813c2e2bb1208522e5a2fcf4f90662afb89f75a6cc206278f0d53ba404f9aeae4beb2a9c71d739671bd1bf70d82d64ea1f6c62c96082d830d5faff7712 @@ -38,13 +38,14 @@ EBUILD distcc-2.18.3-r10.ebuild 5139 SHA256 16af44bebdc9104c7a3192060e12f2261fdc EBUILD distcc-3.0-r4.ebuild 4596 SHA256 3a0637a8c2425d3b9736c221f3b00d95c65c0e2fdd98b502ed6ecad3e6660611 SHA512 f1a7308a9a2bee2a19625c42cd431a9688fe19217f60633f02c044e8322b68bb32cb1ccf774e1cd98bbc3a55f2c8381d62df5e470e1e93b31c6c777de02d2899 WHIRLPOOL 555059ab558b8ec2dca5e35e5e1854ddd0b5c49bac041717f983184bd32ec10555def12558c4ea2e66b01e814ad04ad8510add91600f146038186379b53698d4 EBUILD distcc-3.1-r5.ebuild 4742 SHA256 f8e73d2bbd5d04298feeb02f690f9f89184d48ed894787222761efea1d5de11c SHA512 a037869a2d7adf3cc0e1952d8985e18afc21eb46eae5ef5739c105f6a4a8f50e2c96fe2dc41801685ba4a51b9500294c24366ffe692fe9716d98bf8259e203a1 WHIRLPOOL 7c622631cffafd770d62b7633b9e8f7872fbdd3abddf83f4bf0f0362937c377fcd149dc419e2fb1816063adfab3680776c30634e18cee1aadc2bed9705bb3a66 EBUILD distcc-3.1-r6.ebuild 4810 SHA256 3bc5e2d21ef43f0678b111bb4ea210a0b1398fa4c6ed035f638ebe51a9ed49ea SHA512 f7d03d9d849e41ff6bc89bcb9bd53a57e18ec07170bdab421f36f34d25e6b9713c28a94124d5d84e1f165b75b122f5c2c44472e1764069b1efc5f4ed86570e2e WHIRLPOOL 228fb40a2c5f11e5c5fe2beaf1fcc7e3e2817af601a9ab21f277e771761179a1f19fd0352b362472378a236ef09f903fa5e80983aac8fcfcabba9352e24590c6 +EBUILD distcc-3.1-r7.ebuild 4673 SHA256 a40c05da3962e34dcf3c3255dbc0248797c236dcdb2014444d5c1d88753501cb SHA512 9fe7a672dcbcf86a8c5cbb60495c3c7c72b2dbff86c3ee78492bdf4bb79b0dde8271bd2d47c92a45c06c6ebee1dca4a7cf002afa569d562fcfd82bccfe9eae39 WHIRLPOOL c05d951ca40e8d60c6504ad7bd37049ad1ea88e161d241cacc68f9019f90513756b6bf4bbd0e7ec4bc81029a92407c34cfb0bddd4d385d849558d760faedf98b EBUILD distcc-3.2_rc1.ebuild 5802 SHA256 5c6b8321339df700f3247b08a4a2557f8bff4a609cb9d0809a1cdbf3f1ac81e0 SHA512 a5581206b4f8a3a326404679bb0615a902119b38c51ced446371698202d5dac735de0c8fe7d94c02b2f3bc4b949cc74a13520b1cd29e8417a4653917b0f7ee97 WHIRLPOOL c109ba9c1b52f2a36e0407a23004068f11f694262ed4fc7f4119cd2a5def72bfe8a37c49d5c90003207fb91a87fe8f7f6d4090cf3b9454169c2fdde6890d68fc -MISC ChangeLog 39299 SHA256 4020a4e449cb12db469389fd8c9e8a37fb096f9d55c66f61317a4a900d25275b SHA512 996ae9a423186434d53223e71131e0463519cac07630a0bd6cd12a3f04f0e4e4083da02457c48477ceb71f7615e63cfc2ec4da4508399149bd7faf570a0da3fa WHIRLPOOL e0b29cc21f69d69f17a867c54c38bb9cd83e875311ea0b114b3790367d9b0e8ce4874c267b5b8335954421ce0f3819fda73a6f939df5120a870f56a18126f062 -MISC metadata.xml 482 SHA256 311fb6ef3476d71327044b61d91932c58f130797ee19ca2786db842be847f5ea SHA512 f4aa8f9df59841d19ffd7e9524114b1c480d91b3a4cb2ee1eb3b502b07fa6fe234e30ae68faa71599ec7569786b4eac9d7afc0e3213b54c8d3a3a5c440cb19d2 WHIRLPOOL ef1f81e36e3cd7ebb4f0256274dc07ae879e12616f21e7bf3fdea3914120f7f6c64909fa6b0f95bdf56fa0d3b8a93207d836c7201cf0b453f7bef025f3b0c755 +MISC ChangeLog 39506 SHA256 11dad5e0511d23c0551eb8afda5f33458ac370f34175d6af639944e609b3e51b SHA512 bafb3c2fdf6e9132a48d5e05d5155f2628c4e51c73af2d548651ee98c799154fa67e16e821491682588d487ca27308c571928443f99a07e4601a8a53bafabe3f WHIRLPOOL fb47a55e75eeb4abbdfc61a9b841305c284d3f9d29a075f64005b37443a06e5afa664e88ad80c5ab787693cc368f8ddcf021abfd363a632e970a1dd94b1426c2 +MISC metadata.xml 490 SHA256 c507fd5ee99486759c3acb83a13d874253ce959acd93ac3084febc424a46df86 SHA512 b076932259b157a51d6006324835ab91a9cb86538fb95b8e321647e90675c210051fa3ea342ed1b26b884c166e2825aa16056f2178029cf5d7bf1042cc9425ef WHIRLPOOL 53eb51b9e8fa1acbbef117955d1ad51b36ead058b6cd0b09d902467a58de9854f0b896d7a8961ec2ef019b7d7e39ef24802a5fbb23a11618a9535c17e98bc038 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlEOW0gACgkQCaWpQKGI+9QWOwCbBPLAHmue1Mudd+JEmxLCIHh6 -gKwAnA8Pj5LdBO6YKj1kp64uS11viT05 -=NZAS +iEYEAREKAAYFAlEOs50ACgkQgAnW8HDreRbZvQCggLn2p0/A36EeolPiJl3zuChk +kn4AmgOoP/m6MrE3pBbYe3vGpJ4JE1RG +=Q2Z4 -----END PGP SIGNATURE----- diff --git a/sys-devel/distcc/distcc-3.1-r7.ebuild b/sys-devel/distcc/distcc-3.1-r7.ebuild new file mode 100644 index 000000000000..cf7243635f75 --- /dev/null +++ b/sys-devel/distcc/distcc-3.1-r7.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r7.ebuild,v 1.1 2013/02/03 18:59:23 jlec Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_5,2_6,2_7} ) + +inherit eutils fdo-mime flag-o-matic multilib python-single-r1 toolchain-funcs user + +DESCRIPTION="Distribute compilation of C code across several machines on a network" +HOMEPAGE="http://distcc.org/" +SRC_URI="http://distcc.googlecode.com/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="avahi gnome gtk hardened ipv6 selinux xinetd" + +REQUIRED_USE="^^ ( gtk gnome )" + +RESTRICT="test" + +RDEPEND=" + dev-libs/popt + avahi? ( >=net-dns/avahi-0.6[dbus] ) + gnome? ( + >=gnome-base/libgnome-2 + >=gnome-base/libgnomeui-2 + x11-libs/gtk+:2 + x11-libs/pango + ) + gtk? ( x11-libs/gtk+:2 )" +DEPEND="${RDEPEND} + virtual/pkgconfig" +RDEPEND="${RDEPEND} + !net-misc/pump + >=sys-devel/gcc-config-1.4.1 + selinux? ( sec-policy/selinux-distcc ) + xinetd? ( sys-apps/xinetd )" + +DISTCC_LOG="" +DCCC_PATH="/usr/$(get_libdir)/distcc/bin" +DISTCC_VERBOSE="0" + +pkg_setup() { + enewuser distcc 240 -1 -1 daemon + python-single-r1_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-3.0-xinetd.patch" + # bug #253786 + epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch" + # bug #255188 + epatch "${FILESDIR}/${P}-freedesktop.patch" + # bug #258364 + epatch "${FILESDIR}/${P}-python.patch" + # bug #351979 + epatch "${FILESDIR}/${P}-argc-fix.patch" + + sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die + + # Bugs #120001, #167844 and probably more. See patch for description. + use hardened && epatch "${FILESDIR}/distcc-hardened.patch" +} + +src_configure() { + local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}" + # More legacy stuff? + [ "$(gcc-major-version)" = "2" ] && filter-lfs-flags + + # --disable-rfc2553 b0rked, bug #254176 + use ipv6 && myconf="${myconf} --enable-rfc2553" + + econf \ + $(use_with avahi) \ + $(use_with gtk) \ + $(use_with gnome) \ + ${myconf} +} + +src_install() { + # In rare cases, parallel make install failed + MAKEOPTS+=" -j1" + default + + dobin "${FILESDIR}/3.0/distcc-config" + + newinitd "${FILESDIR}/${PV}/init" distccd + + cp "${FILESDIR}/3.0/conf" "${T}/distccd" + if use avahi; then + cat >> "${T}/distccd" <<-EOF + + # Enable zeroconf support in distccd + DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" + EOF + fi + doconfd "${T}/distccd" + + cat > "${T}/02distcc" <<-EOF + # This file is managed by distcc-config; use it to change these settings. + DISTCC_LOG="${DISTCC_LOG}" + DCCC_PATH="${DCCC_PATH}" + DISTCC_VERBOSE="${DISTCC_VERBOSE}" + EOF + doenvd "${T}/02distcc" + + # create the masquerade directory + dodir "${DCCC_PATH}" + for f in cc c++ gcc g++; do + dosym /usr/bin/distcc "${DCCC_PATH}/${f}" + if [ "${f}" != "cc" ]; then + dosym /usr/bin/distcc "${DCCC_PATH}/${CTARGET:-${CHOST}}-${f}" + fi + done + + # create the distccd pid directory + keepdir /var/run/distccd + fowners distcc:daemon /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" || die + dosym distccmon-gui /usr/bin/distccmon-gnome + fi + + if use xinetd; then + insinto /etc/xinetd.d + newins "doc/example/xinetd" distcc + fi + + rm -rf "${D}/etc/default" || die + rm -f "${D}/etc/distcc/clients.allow" || die + rm -f "${D}/etc/distcc/commands.allow.sh" || die + + python_fix_shebang "${ED}" + python_optimize "${ED}"/$(python_get_sitedir) +} + +pkg_postinst() { + use gnome && fdo-mime_desktop_database_update + + if use ipv6; then + elog + elog "IPv6 has not supported yet by ${P}." + fi + elog + elog "Tips on using distcc with Gentoo can be found at" + elog "http://www.gentoo.org/doc/en/distcc.xml" + elog + elog "How to use pump mode with Gentoo:" + elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" + elog "# pump emerge -u world" + elog + elog "To use the distccmon programs with Gentoo you should use this command:" + elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-text 5" + + if use gnome || use gtk; then + elog "Or:" + elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-gnome" + fi + + elog + elog "***SECURITY NOTICE***" + elog "If you are upgrading distcc please make sure to run etc-update to" + elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" + elog "added security precautions (the --listen and --allow directives)" + elog +} + +pkg_postrm() { + use gnome && fdo-mime_desktop_database_update +} diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml index cb0f4bf135f8..3dcc309a3965 100644 --- a/sys-devel/distcc/metadata.xml +++ b/sys-devel/distcc/metadata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>cluster</herd> - <longdescription lang="en"> + <herd>cluster</herd> + <longdescription lang="en"> Distcc is a program to distribute compilation of C code across several machines on a network. </longdescription> - <use> - <flag name="crossdev">Enable support for <pkg>sys-devel/crossdev</pkg></flag> - <flag name="gssapi">Enable support for <pkg>net-libs/libgssglue</pkg></flag> - </use> + <use> + <flag name="crossdev">Enable support for <pkg>sys-devel/crossdev</pkg></flag> + <flag name="gssapi">Enable support for <pkg>net-libs/libgssglue</pkg></flag> + </use> </pkgmetadata> |