diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2013-08-23 05:55:01 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2013-08-23 05:55:01 +0000 |
| commit | f2dd4dbf3e3f319cd7e33083e351b35c8fd7ba5a (patch) | |
| tree | bb2380c6e191fd1077476433e2a28d91e74f07d3 /sys-apps | |
| parent | Remove old. (diff) | |
| download | historical-f2dd4dbf3e3f319cd7e33083e351b35c8fd7ba5a.tar.gz historical-f2dd4dbf3e3f319cd7e33083e351b35c8fd7ba5a.tar.bz2 historical-f2dd4dbf3e3f319cd7e33083e351b35c8fd7ba5a.zip | |
Fix python-single-r1 usage as reported by hasufell in bug #482032
Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/entropy/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/entropy/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/entropy/entropy-216.ebuild | 22 |
3 files changed, 13 insertions, 18 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/Manifest b/sys-apps/entropy/Manifest index 68fa51fb9ae4..9e379c5c2a89 100644 --- a/sys-apps/entropy/Manifest +++ b/sys-apps/entropy/Manifest @@ -1,4 +1,4 @@ DIST entropy-216.tar.bz2 18429942 SHA256 c2569d7233b80b9373cde11645e6e9c4142038387ad4aa8943ed1ddfeb86f501 SHA512 8b6a19f311520ca48a998aadb10717f5ad81eb8c26b71c1f8a8b67f84fd9876117adf650eb4fa59893130fd3db669ba370804a33311fe7eff45546a5a92e6b7d WHIRLPOOL b220b870f099cfe014ad355760855dc91bbc11c76f39b34e03ec251e1f8f9bdf04bb4f1dd0ad9e0c5e63a4328f6c9691abd4f9e759b8546fac7026386b4c174b -EBUILD entropy-216.ebuild 3452 SHA256 316c105ab8f0391288f6ef62f6f7ba88ef912976b72a1864ca85f366ff0bc238 SHA512 8730e4c068b44a804775009142a186f3215019bb07477173cf4c0be68ee9ac321662f70bca4dbaee90c1ee6320240893ce5fae38eba4675c78d0c090c0bd59f2 WHIRLPOOL 35bec4c21e8ea8f97ebb27483af580f570fed64a5d477a2e63478fc532171ac0f833d9121a6f951161cff4985d3a0c2d2685827caacf35a3e640e2ae6a2f1ceb -MISC ChangeLog 5653 SHA256 42362ba178006c6f2b9dc2f9a5d2a771b89a59856dba666481c07a0784171bed SHA512 6b63f706e467be6e25816fad58fa04496deaeb6ab4bac65c43a4e0ac01def4d739c23e437b69394cbf782e46c640626548c167005ae2b5e42c79e5970652c8ae WHIRLPOOL 39a345881875a583b2f7de6949e6f8b60794340be942a04e6a1e5edd759245cb90698ba662b0600bd4eea51a6b477a19262153a863962c79f84726e6755208a9 +EBUILD entropy-216.ebuild 3248 SHA256 775a292f017eac4010ab07850c32cb327660241adae479d6fdbe20f9f4a90154 SHA512 1e3e7c80ad19e94d07211c8b321c9983ae534c6b3a4ff22ccc51291ef50125bfc17a742c10171963c02474502c9b24c8a778f325bef8202747edc24b54b13438 WHIRLPOOL bdbf76e86b276902e69b9cc00861cafd0db4bd1e1089c3a6e19a1e2f895d1035c367348c4b6abedafc9d92ac91216b9f09969ce0b8c5bcf991fc41a070f30515 +MISC ChangeLog 5792 SHA256 9e863a6e5647818d7a693ec82ecf67c17b3388e7b295753135c052c0164c96fb SHA512 69916a83f441d494310b5132a536083f78e739bf681856f154bd7a3f666b653ec86068b1b6ae4cbe7ea3ab686f0760f256b68a086b5aff0d0b547eff6b0f5c74 WHIRLPOOL fe2fc81f4043e2ef1bde1cdc416b084942f0e6b7f0decd4e0bef6e3c990f88cb1ca9a9d3b9b9e03d6771f18c03e9db9b985eff0342f9e9b50a2611e3a4e63908 MISC metadata.xml 249 SHA256 c8f6c77ed785305b3c81640d0f8aefd1e0979c446458117922d2ba8979e2f53f SHA512 e90f800cf4b5909428161ee7577c8599e094765bcf366b151fe21c23c78b84df015e5ea766967e6d7f02d87e2fe1293d508a28b682bc7fcb395a47acbd741b16 WHIRLPOOL a34e9bb9649faaed8ccc588236a567453f3ef4990771cd27e9ebe3dfa37ecd7876f248c3ffa9a3f10ed1664f1be12c7d56d89375e41e2ceaa19b1439b32a833d 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 |