diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2013-08-23 05:54:57 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2013-08-23 05:54:57 +0000 |
| commit | cd221c2aa151e8fbd39a47b9e19b1c896d47e9e7 (patch) | |
| tree | 7e3c50caab0da3cd89105405cd4bb8fcfa505101 /sys-apps/entropy | |
| parent | Remove old. (diff) | |
| download | gentoo-2-cd221c2aa151e8fbd39a47b9e19b1c896d47e9e7.tar.gz gentoo-2-cd221c2aa151e8fbd39a47b9e19b1c896d47e9e7.tar.bz2 gentoo-2-cd221c2aa151e8fbd39a47b9e19b1c896d47e9e7.zip | |
Fix python-single-r1 usage as reported by hasufell in bug #482032
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-apps/entropy')
| -rw-r--r-- | sys-apps/entropy/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/entropy/entropy-216.ebuild | 22 |
2 files changed, 11 insertions, 16 deletions
diff --git a/sys-apps/entropy/ChangeLog b/sys-apps/entropy/ChangeLog index baf44ab95fc8..a9991d3efeb3 100644 --- a/sys-apps/entropy/ChangeLog +++ b/sys-apps/entropy/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/entropy # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/entropy/ChangeLog,v 1.41 2013/08/22 14:55:43 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/entropy/ChangeLog,v 1.42 2013/08/23 05:54:57 lxnay Exp $ + + 23 Aug 2013; Fabio Erculiani <lxnay@gentoo.org> entropy-216.ebuild: + Fix python-single-r1 usage as reported by hasufell in bug #482032 22 Aug 2013; Fabio Erculiani <lxnay@gentoo.org> -entropy-189.ebuild: drop older version 189 diff --git a/sys-apps/entropy/entropy-216.ebuild b/sys-apps/entropy/entropy-216.ebuild index de1d29af7deb..d9c40f9d6823 100644 --- a/sys-apps/entropy/entropy-216.ebuild +++ b/sys-apps/entropy/entropy-216.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/entropy/entropy-216.ebuild,v 1.1 2013/08/22 11:11:36 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/entropy/entropy-216.ebuild,v 1.2 2013/08/23 05:54:57 lxnay Exp $ EAPI=5 @@ -23,12 +23,16 @@ RDEPEND="dev-db/sqlite:3[soundex(+)] net-misc/rsync sys-apps/diffutils sys-apps/sandbox - >=sys-apps/portage-2.1.9 + >=sys-apps/portage-2.1.9[${PYTHON_USEDEP}] sys-devel/gettext ${PYTHON_DEPS}" DEPEND="${RDEPEND} dev-util/intltool" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +S="${S}/lib" + REPO_CONFPATH="${ROOT}/etc/entropy/repositories.conf" REPO_D_CONFPATH="${ROOT}/etc/entropy/repositories.conf.d" ENTROPY_CACHEDIR="${ROOT}/var/lib/entropy/caches" @@ -45,19 +49,8 @@ pkg_setup() { enewuser entropy-nopriv -1 -1 -1 entropy-nopriv || die "failed to create entropy-nopriv user" } -src_compile() { - cd "${S}"/lib || die - emake || die "make failed" -} - src_install() { - # create directories required by equo - dodir /var/run/entropy - keepdir /var/run/entropy - - cd "${S}"/lib || die - # TODO: drop VARDIR after 146 - emake DESTDIR="${D}" VARDIR="/var" LIBDIR="usr/lib" install || die "make install failed" + emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed" python_optimize "${D}/usr/lib/entropy/lib/entropy" } @@ -107,7 +100,6 @@ pkg_postinst() { done # Setup Entropy Library directories ownership - chown -R root:entropy "${ROOT}/var/tmp/entropy" chown root:entropy "${ROOT}/var/lib/entropy" # no recursion chown root:entropy "${ROOT}/var/lib/entropy/client/packages" # no recursion chown root:entropy "${ROOT}/var/log/entropy" # no recursion |