Use Python 2, call python_mod_optimize() and python_mod_cleanup() (bug #316943).

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

3 files changed, 184 insertions, 15 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 5b8e1bf5ae75..a6f23b9dc5ea 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/distcc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.206 2009/10/19 21:09:13 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.207 2010/12/22 21:16:55 arfrever Exp $
+
+*distcc-3.1-r5 (22 Dec 2010)
+
+  22 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +distcc-3.1-r5.ebuild:
+  Use Python 2, call python_mod_optimize() and python_mod_cleanup() (bug #316943).
 
   19 Oct 2009; Alexis Ballier <aballier@gentoo.org> distcc-3.1-r4.ebuild:
   keyword ~sparc-fbsd
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 55e30a88e21c..8997067c989d 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.18-r1/conf 1345 RMD160 6921e75f3d71ecebf66ebf4356482655ff1d0a19 SHA1 89aa69c5cc8a645fe3ff11282cd230c3a3dd898a SHA256 c48a04bd789d38682c8e1003f891a4428e5bb457696578afe56a913ec003fdef
 AUX 2.18-r1/init 927 RMD160 11638f1be4f1a55414517e9982b3a2ee508b9b9d SHA1 6456b0af8e63112258fd401afc1abe7b578004cb SHA256 3b7343b659ce864da8b730d2bf2c221de6446d6afc935f7686d85fc8d0983167
 AUX 2.18/conf 1267 RMD160 a12045786088255c9bc8f4ad826928c00efac567 SHA1 828f62bee16cfb4b2667cdbda5a18e9516bcf969 SHA256 51365685f2f02c6f2846e4b35ed1ae3628999ed5035af3ad0c7b2d68acfe7c3d
@@ -31,14 +28,6 @@ DIST distcc-3.1.tar.bz2 588820 RMD160 82229c230e6917b0df7db275460579b02dbf6b60 S
 EBUILD distcc-2.18.3-r10.ebuild 5142 RMD160 64d8b7d135334e023aa4450be62da861ea591298 SHA1 8de697fc7beddfab8192be91ca27faeb4074dd25 SHA256 2dfc6ea7957cb4baf1632bac8d417be835cb6b893f83fbefece100b782ae55fe
 EBUILD distcc-3.0-r4.ebuild 4590 RMD160 624db18d0f56a00181e2d2897020f8e6e082fe82 SHA1 6d87b0491d21d599da3e9c56e329009b6a82a2e2 SHA256 417ffc3783df12916ff68402072c2684d46579b082dce14b567c91f3df0356e1
 EBUILD distcc-3.1-r4.ebuild 4482 RMD160 a5b1333eba02b37c4f93580aae83e09884708679 SHA1 40f75635d69d048bd4688e8f684e8b0f880324ca SHA256 3ba74bd42f4bed7b686748a7931d1be63d80ef7bc413c84b0dff3373eb9df8ac
-MISC ChangeLog 37399 RMD160 d97506e175a081d0f63d918cb5e8a4e3e2387deb SHA1 84c1f29f80a3908db69148a8f71ba4c5774a8920 SHA256 d9e33bba7a86f9286fdecec0bdd5065693b2c6f5bcd3904408899c887945d6e9
+EBUILD distcc-3.1-r5.ebuild 4744 RMD160 77c896a4335b5e6355d2c003e98367e5eed0b74b SHA1 589cf00b7f6e15525cfe7a357a1e39d2e6ac3189 SHA256 819388acc994f31a660228d2c975de2556e959cbb98facd262002fb074b105d0
+MISC ChangeLog 37611 RMD160 35b52cdeb0b343f68e7feb5ca20691397cf0bde7 SHA1 de2191b6c346de1d4b6b40cf49a2bbc268750437 SHA256 30ea91dabaab674e2652e2a97a1718e62920290100c74a351c97c14a644e71e6
 MISC metadata.xml 372 RMD160 39cf4903218a1394a2dbbe5b4b5f53bda0b3791a SHA1 f68a302b90535835e7119f9701d445a5dfc05129 SHA256 25318fa35e9a311cf00b5ce32d90e524e17599eb8c091de96547030a647e80f4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iJwEAQECAAYFAkyKjCEACgkQIiMqcbOVdxT1jwP/Wrg1DAcnwssVfkFlU/6mjt8Q
-Zu411tGDrqWNR7x5R0XeFhVtyija1pMXIfdzmcHMl2592nWmWnJweKWD7ZLYW7Gs
-pcNWg1Z6gx/QiDTJPPM8tYQE97osQj/z3BA53hAarbLRisl58hQKcFzY6eKNw5wb
-dMKLs98KT1TfUxDmduQ=
-=hPkw
------END PGP SIGNATURE-----
diff --git a/sys-devel/distcc/distcc-3.1-r5.ebuild b/sys-devel/distcc/distcc-3.1-r5.ebuild
new file mode 100644
index 000000000000..54eee2e2cec2
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.1-r5.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r5.ebuild,v 1.1 2010/12/22 21:16:55 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils fdo-mime flag-o-matic multilib python toolchain-funcs
+
+DESCRIPTION="a program to 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"
+
+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}
+	dev-util/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_set_active_version 2
+	python_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"
+
+	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} || die "econf failed"
+}
+
+src_install() {
+	# In rare cases, parallel make install failed
+	emake -j1 DESTDIR="${D}" install || die
+
+	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"
+	rm -f "${D}/etc/distcc/clients.allow"
+	rm -f "${D}/etc/distcc/commands.allow.sh"
+
+	python_convert_shebangs -r $(python_get_version) "${ED}"
+	sed -e "s:${EPREFIX}/usr/bin/python:$(PYTHON -a):" -i "${ED}usr/bin/pump" || die "sed failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize include_server
+	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() {
+	python_mod_cleanup include_server
+	use gnome && fdo-mime_desktop_database_update
+}