From e5a459d1477577ff4b7fc696f6915806e9624ccd Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Wed, 30 Nov 2011 23:03:31 +0000 Subject: [PATCH] 0.7.6: better user support. Clean old versions out also Package-Manager: portage-2.1.10.37/cvs/Linux x86_64 --- sys-apps/pkgcore/ChangeLog | 8 +- sys-apps/pkgcore/Manifest | 15 ++-- sys-apps/pkgcore/pkgcore-0.7.2.ebuild | 74 ------------------- sys-apps/pkgcore/pkgcore-0.7.4.ebuild | 71 ------------------ ...e-0.7.5-r1.ebuild => pkgcore-0.7.6.ebuild} | 6 +- 5 files changed, 14 insertions(+), 160 deletions(-) delete mode 100644 sys-apps/pkgcore/pkgcore-0.7.2.ebuild delete mode 100644 sys-apps/pkgcore/pkgcore-0.7.4.ebuild rename sys-apps/pkgcore/{pkgcore-0.7.5-r1.ebuild => pkgcore-0.7.6.ebuild} (93%) diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog index d845ddba5ede..3876fc84fddd 100644 --- a/sys-apps/pkgcore/ChangeLog +++ b/sys-apps/pkgcore/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/pkgcore # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.131 2011/11/18 04:04:58 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.132 2011/11/30 23:03:31 ferringb Exp $ + +*pkgcore-0.7.6 (30 Nov 2011) + + 30 Nov 2011; Brian Harring -pkgcore-0.7.2.ebuild, + -pkgcore-0.7.4.ebuild, -pkgcore-0.7.5-r1.ebuild, +pkgcore-0.7.6.ebuild: + new version- better user support. Drop older versions in the process. *pkgcore-0.7.5-r2 (18 Nov 2011) diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest index 3e581817f427..60fbcbecffb4 100644 --- a/sys-apps/pkgcore/Manifest +++ b/sys-apps/pkgcore/Manifest @@ -3,20 +3,17 @@ Hash: SHA1 AUX pkgcore-0.7.5-dosym.patch 1165 RMD160 a5d7bcb6fac18150ecb298d8c2acc34b601af4d7 SHA1 1728cc16c276c7731ede940db98fcd2166265889 SHA256 ecc8923d4d6419c740f6f0ca8d533de949f224767b15fa58beab06006e5e38f1 AUX pkgcore-0.7.5-force-python-binary.patch 1238 RMD160 dc03e2dca5222268d63f6a63b9bd4ec8ac49f50f SHA1 82e1ecb996020c519bdf8e24077a40e1d98aafa8 SHA256 0186632d3758ee2f625de16b8287042d9c937af274ea56b2f99d83770d7007c4 -DIST pkgcore-0.7.2.tar.bz2 426679 RMD160 1a8773336bc804e58aec5ca6d3e4ee895f60e8cc SHA1 38d4343fda8b9c19ab427cd21b7c8ddfcb70727c SHA256 44a9b2d2768573313b7e6869892f091412a7972f86b570ccd662dfc105c60cfd -DIST pkgcore-0.7.4.tar.bz2 429202 RMD160 ec71f1ef838409a6fbc6513f60d50e818813786f SHA1 245249b626acf7420eb10d09bec47c9668c330f7 SHA256 e62a1777ee1952d2cb5add9ac95b432ed8b1222c185310cfd0490484b944d75c DIST pkgcore-0.7.5.tar.bz2 429564 RMD160 08f24ccab29d8e9b319cd1eadc62c3bdf25731e0 SHA1 645dcd292d6cb832671cd7d0884fe33bcfef00a1 SHA256 9d6172ce5eef9c5818946dd52ddc3be61b59e57df227d6d76fb918653ab5daf2 -EBUILD pkgcore-0.7.2.ebuild 1763 RMD160 66d259f83d823b417eb71dd9b727a91346c17265 SHA1 379b33b550d626bc58dfc2873dd94a688902750d SHA256 e5ab494e04959280de7275d5d79764fbedd5bc1cb4c5df4f0e5f6eaca51b9eed -EBUILD pkgcore-0.7.4.ebuild 1726 RMD160 a8561165cbf2c6bb249296557f53bfe5d9c0cfcc SHA1 d6764f09cdad276b9221ca4068db429d1488f38f SHA256 56f8ea246617ff3106780ab795f8fcd62a85b040ce38cef8b8d320e13c239769 -EBUILD pkgcore-0.7.5-r1.ebuild 1830 RMD160 8dbe3a814e30490781bd4d8ac6f86cd796e99f10 SHA1 67852fbc68beb69d12a9fcfd71cfa7dde75455ef SHA256 28756c6999d1d8ae0195e44961ebd77809aa41f2d103cc8d0d710fc8742cc99c +DIST pkgcore-0.7.6.tar.bz2 431834 RMD160 d8d7ee0879671baa9cae57293db11521b20b38e7 SHA1 8cc83b4de20f46cfb526a353fbfcfa39be786207 SHA256 683e4486c536aa7db1c85038c12ade108a1afe87c0440b03d7b675459a3cb805 EBUILD pkgcore-0.7.5-r2.ebuild 1870 RMD160 948037c5bd6ad9e75b4253c11a530bc036ce4862 SHA1 00dcf7567987eab28a1de1f1cd73d52946bbf55f SHA256 ae59abec5f538230e4742873275231fd3a151806f831b009f0cdf7f4b93f2028 +EBUILD pkgcore-0.7.6.ebuild 1754 RMD160 eac027aff6460b4e7c740cd51ea108b7ffd9f7ad SHA1 d734782e764edf1e6b83632b7637f32f443aebe5 SHA256 e968a2d63577eddfc940a27a81d748f2a23e1e5d4fb2913a5babce37d59ea59d EBUILD pkgcore-9999.ebuild 1754 RMD160 f2a8ee71d586cd40f8b86abf466ae13ddf55652b SHA1 02611d7e616b6ab902264e903a0a8b4767b5fe90 SHA256 edb16c565f7f5feb52486c5f07d1d7b47ad98c0c1c48190e4609ff71153b6417 -MISC ChangeLog 21569 RMD160 9aeb4f1778c70ad67dfb250da63566f04b3879cc SHA1 8a291abd41ed880fd951b6051175d4e041032be4 SHA256 7a4aa00cf241107e7b625b1836cde2457caa7ec453b85409a89ccd6b929e7b1a +MISC ChangeLog 21820 RMD160 2931d4ac80c7f9ddc2d638a87916b425fdeb27b3 SHA1 63970a6d7a9c5f0b538dd4f689a10f535fa9b4c0 SHA256 3e5df7ad210b4cc0b0671d56b7bfdb101c10ad703080e5526abc65a0c429953d MISC metadata.xml 234 RMD160 7f7e4ec7da60203d4fc0d59ea9b7001ca84fd88c SHA1 fc54601f1382d43dd16625b242d7a52ff36f3782 SHA256 f036ed153de912a1bb1466478e9ce0c9d4ecae55929f6b13490c3f47a242fc0d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7F2W8ACgkQsiLx3HvNzgflUgCfQPhtmWarmOOwZqLjiggqx7+0 -HS4AoJtxYQmQ/X2pu3blQ1qVu2/chzUb -=HM0l +iEYEARECAAYFAk7WtkkACgkQsiLx3HvNzgfJ7gCgqjkYIew1e09JlaFWXhMoZXIs +6CEAoMWK465zmF+H2GjKqoiY3Hk4/9XO +=YjDK -----END PGP SIGNATURE----- diff --git a/sys-apps/pkgcore/pkgcore-0.7.2.ebuild b/sys-apps/pkgcore/pkgcore-0.7.2.ebuild deleted file mode 100644 index 77fa19e427ef..000000000000 --- a/sys-apps/pkgcore/pkgcore-0.7.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.2.ebuild,v 1.2 2011/09/28 04:00:18 ferringb Exp $ - -EAPI="3" -DISTUTILS_SRC_TEST="setup.py" - -inherit distutils - -DESCRIPTION="pkgcore package manager" -HOMEPAGE="http://pkgcore.googlecode.com/" -SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="-doc build" - -RDEPEND=">=dev-lang/python-2.4 - >=dev-python/snakeoil-0.4.3 - !build? ( - dev-python/pyparsing - ) - || ( >=dev-lang/python-2.5 dev-python/pycrypto )" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" - -DOCS="AUTHORS NEWS" - -pkg_setup() { - # disable snakeoil 2to3 caching... - unset PY2TO3_CACHEDIR - python_pkg_setup -} - -src_compile() { - distutils_src_compile - - if use doc; then - python setup.py build_docs || die "doc building failed" - fi -} - -src_install() { - distutils_src_install - - if use doc; then - dohtml -r build/sphinx/html/* - fi -} - -pkg_postinst() { - distutils_pkg_postinst - pplugincache - - if [[ -d "${ROOT}etc/pkgcore/plugins" ]]; then - elog "You still have an /etc/pkgcore/plugins from pkgcore 0.1." - elog "It is unused by pkgcore >= 0.2, remove it now." - die "remove /etc/pkgcore/plugins from pkgcore 0.1" - fi - - # This is left behind by pkgcore 0.2. - rm -f "${ROOT}"$(python_get_sitedir)/pkgcore/plugins/plugincache -} - -pkg_postrm() { - # Careful not to remove this on up/downgrades. - local sitep="${ROOT}"$(python_get_sitedir)/site-packages - if [[ -e "${sitep}/pkgcore/plugins/plugincache2" ]] && - ! [[ -e "${sitep}/pkgcore/plugin.py" ]]; then - rm "${sitep}/pkgcore/plugins/plugincache2" - fi - distutils_pkg_postrm -} diff --git a/sys-apps/pkgcore/pkgcore-0.7.4.ebuild b/sys-apps/pkgcore/pkgcore-0.7.4.ebuild deleted file mode 100644 index fdd312e1d4ba..000000000000 --- a/sys-apps/pkgcore/pkgcore-0.7.4.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.4.ebuild,v 1.1 2011/10/27 22:11:41 ferringb Exp $ - -EAPI="3" -DISTUTILS_SRC_TEST="setup.py" - -inherit distutils - -DESCRIPTION="pkgcore package manager" -HOMEPAGE="http://pkgcore.googlecode.com/" -SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="-doc build" - -RDEPEND=">=dev-lang/python-2.4 - >=dev-python/snakeoil-0.4.4 - || ( >=dev-lang/python-2.5 dev-python/pycrypto )" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" - -DOCS="AUTHORS NEWS" - -pkg_setup() { - # disable snakeoil 2to3 caching... - unset PY2TO3_CACHEDIR - python_pkg_setup -} - -src_compile() { - distutils_src_compile - - if use doc; then - python setup.py build_docs || die "doc building failed" - fi -} - -src_install() { - distutils_src_install - - if use doc; then - dohtml -r build/sphinx/html/* - fi -} - -pkg_postinst() { - distutils_pkg_postinst - pplugincache - - if [[ -d "${ROOT}etc/pkgcore/plugins" ]]; then - elog "You still have an /etc/pkgcore/plugins from pkgcore 0.1." - elog "It is unused by pkgcore >= 0.2, remove it now." - die "remove /etc/pkgcore/plugins from pkgcore 0.1" - fi - - # This is left behind by pkgcore 0.2. - rm -f "${ROOT}"$(python_get_sitedir)/pkgcore/plugins/plugincache -} - -pkg_postrm() { - # Careful not to remove this on up/downgrades. - local sitep="${ROOT}"$(python_get_sitedir)/site-packages - if [[ -e "${sitep}/pkgcore/plugins/plugincache2" ]] && - ! [[ -e "${sitep}/pkgcore/plugin.py" ]]; then - rm "${sitep}/pkgcore/plugins/plugincache2" - fi - distutils_pkg_postrm -} diff --git a/sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.7.6.ebuild similarity index 93% rename from sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild rename to sys-apps/pkgcore/pkgcore-0.7.6.ebuild index 4260aabd48ef..a451cb06de05 100644 --- a/sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.7.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild,v 1.1 2011/11/10 00:56:45 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.6.ebuild,v 1.1 2011/11/30 23:03:31 ferringb Exp $ EAPI="3" DISTUTILS_SRC_TEST="setup.py" @@ -30,10 +30,6 @@ pkg_setup() { python_pkg_setup } -src_prepare() { - epatch "$FILESDIR/"$PN-$PV-force-python-binary.patch -} - src_compile() { distutils_src_compile -- 2.26.2