diff -ur inn.orig/inn-2.5.2-r1.ebuild inn/inn-2.5.2-r1.ebuild --- inn.orig/inn-2.5.2-r1.ebuild 2011-08-06 12:01:21.000000000 +0800 +++ inn/inn-2.5.2-r1.ebuild 2011-11-20 05:31:18.375926914 +0800 @@ -3,8 +3,8 @@ # $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.2-r1.ebuild,v 1.3 2011/08/06 03:51:55 jer Exp $ EAPI="4" - -inherit autotools multilib ssl-cert +PYTHON_DEPEND="python? 2" +inherit autotools multilib ssl-cert python DESCRIPTION="The Internet News daemon, fully featured NNTP server" HOMEPAGE="https://www.isc.org/software/inn" @@ -21,11 +21,16 @@ kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) - python? ( dev-lang/python ) berkdb? ( sys-libs/db ) -" + " RDEPEND="${DEPEND}" +pkg_setup() { + if use python; then + python_set_active_version 2 + fi +} + src_prepare() { sed -i -e "s: -B .OLD::" Makefile.global.in || die @@ -67,27 +72,26 @@ $(use_enable ipv6) \ $(use_enable !inntaggedhash largefiles) \ $(use_enable inntaggedhash tagged-hash) \ - $(use_enable innkeywords keywords) \ - || die "econf failed" + $(use_enable innkeywords keywords) } src_install() { - emake DESTDIR="${D}/" P="" SPECIAL="" install + emake DESTDIR="${ED}/" P="" SPECIAL="" install chown -R root:0 \ - "${D}"/usr/$(get_libdir)/news/$(get_libdir) \ - "${D}"/usr/$(get_libdir)/news/include \ - "${D}"/usr/share/doc \ - "${D}"/usr/share/man \ + "${ED}"/usr/$(get_libdir)/news/$(get_libdir) \ + "${ED}"/usr/$(get_libdir)/news/include \ + "${ED}"/usr/share/doc \ + "${ED}"/usr/share/man \ || die - chmod 644 "${D}"/etc/news/* || die + chmod 644 "${ED}"/etc/news/* || die chmod 640 \ - "${D}"/etc/news/control.ctl \ - "${D}"/etc/news/expire.ctl \ - "${D}"/etc/news/incoming.conf \ - "${D}"/etc/news/nntpsend.ctl \ - "${D}"/etc/news/passwd.nntp \ - "${D}"/etc/news/readers.conf \ + "${ED}"/etc/news/control.ctl \ + "${ED}"/etc/news/expire.ctl \ + "${ED}"/etc/news/incoming.conf \ + "${ED}"/etc/news/nntpsend.ctl \ + "${ED}"/etc/news/passwd.nntp \ + "${ED}"/etc/news/readers.conf \ || die # Prevent old db/* files from being overwritten diff -ur inn.orig/inn-2.5.2.ebuild inn/inn-2.5.2.ebuild --- inn.orig/inn-2.5.2.ebuild 2011-11-20 05:17:52.475927262 +0800 +++ inn/inn-2.5.2.ebuild 2011-11-20 05:21:57.590927171 +0800 @@ -3,7 +3,8 @@ # $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.2.ebuild,v 1.5 2011/06/22 21:22:01 ranger Exp $ EAPI="3" -inherit autotools eutils fixheadtails multilib ssl-cert +PYTHON_DEPEND="python? 2" +inherit autotools eutils fixheadtails multilib ssl-cert python DESCRIPTION="The Internet News daemon, fully featured NNTP server" HOMEPAGE="https://www.isc.org/software/inn" @@ -21,9 +22,16 @@ sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) -" + " DEPEND="${RDEPEND}" +pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + fi +} + src_prepare() { #ht_fix_file configure.in support/fixscript.in sed -i -e "s/ -B .OLD//" Makefile.global.in || die "sed failed" @@ -71,13 +79,13 @@ } src_install() { - emake DESTDIR="${D}/" P="" SPECIAL="" install || die "make install failed" + emake DESTDIR="${ED}/" P="" SPECIAL="" install || die "make install failed" - chown -R root:0 "${D}"/usr/{$(get_libdir)/news/{lib,include},share/{doc,man}} - chmod 644 "${D}"/etc/news/* + chown -R root:0 "${ED}"/usr/{$(get_libdir)/news/{lib,include},share/{doc,man}} + chmod 644 "${ED}"/etc/news/* for file in control.ctl expire.ctl incoming.conf nntpsend.ctl passwd.nntp readers.conf do - chmod 640 "${D}"/etc/news/${file} + chmod 640 "${ED}"/etc/news/${file} done # Prevent old db/* files from being overwritten