diff options
author | Brian Harring <ferringb@gentoo.org> | 2011-11-18 04:04:58 +0000 |
---|---|---|
committer | Brian Harring <ferringb@gentoo.org> | 2011-11-18 04:04:58 +0000 |
commit | bf9b9a04de6479d4e1dc4ecb263a9dcb8b4e7259 (patch) | |
tree | b0c6ccc85f31c468b799af53f0eb2f2a55b27e1c /sys-apps | |
parent | Remove old version (diff) | |
download | historical-bf9b9a04de6479d4e1dc4ecb263a9dcb8b4e7259.tar.gz historical-bf9b9a04de6479d4e1dc4ecb263a9dcb8b4e7259.tar.bz2 historical-bf9b9a04de6479d4e1dc4ecb263a9dcb8b4e7259.zip |
bug 379899; honor portage dosym behaviour, rather than forcing breakage on users while PMS decides to shit or get off the pot
Package-Manager: portage-2.1.10.19/cvs/Linux x86_64
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/pkgcore/ChangeLog | 8 | ||||
-rw-r--r-- | sys-apps/pkgcore/Manifest | 10 | ||||
-rw-r--r-- | sys-apps/pkgcore/files/pkgcore-0.7.5-dosym.patch | 33 | ||||
-rw-r--r-- | sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild | 76 |
4 files changed, 122 insertions, 5 deletions
diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog index 06c3a5a9a7b4..d845ddba5ede 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.130 2011/11/10 00:56:45 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.131 2011/11/18 04:04:58 ferringb Exp $ + +*pkgcore-0.7.5-r2 (18 Nov 2011) + + 18 Nov 2011; Brian Harring <ferringb@gentoo.org> +pkgcore-0.7.5-r2.ebuild, + +files/pkgcore-0.7.5-dosym.patch: + bug 379889; honor portage dosym behaviour rather than PMS. *pkgcore-0.7.5-r1 (10 Nov 2011) diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest index 46825c13c51d..3e581817f427 100644 --- a/sys-apps/pkgcore/Manifest +++ b/sys-apps/pkgcore/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- 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 @@ -8,13 +9,14 @@ DIST pkgcore-0.7.5.tar.bz2 429564 RMD160 08f24ccab29d8e9b319cd1eadc62c3bdf25731e 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 +EBUILD pkgcore-0.7.5-r2.ebuild 1870 RMD160 948037c5bd6ad9e75b4253c11a530bc036ce4862 SHA1 00dcf7567987eab28a1de1f1cd73d52946bbf55f SHA256 ae59abec5f538230e4742873275231fd3a151806f831b009f0cdf7f4b93f2028 EBUILD pkgcore-9999.ebuild 1754 RMD160 f2a8ee71d586cd40f8b86abf466ae13ddf55652b SHA1 02611d7e616b6ab902264e903a0a8b4767b5fe90 SHA256 edb16c565f7f5feb52486c5f07d1d7b47ad98c0c1c48190e4609ff71153b6417 -MISC ChangeLog 21361 RMD160 f42b839bacd87fb99c7ee49246449c6d3f91250d SHA1 213b9168bb255d05b2cd7f7cfe96e90876a9c409 SHA256 3fea3f3b695496c3ac7369ae463f56309dfa50590ed5f3f427baef787c797baa +MISC ChangeLog 21569 RMD160 9aeb4f1778c70ad67dfb250da63566f04b3879cc SHA1 8a291abd41ed880fd951b6051175d4e041032be4 SHA256 7a4aa00cf241107e7b625b1836cde2457caa7ec453b85409a89ccd6b929e7b1a MISC metadata.xml 234 RMD160 7f7e4ec7da60203d4fc0d59ea9b7001ca84fd88c SHA1 fc54601f1382d43dd16625b242d7a52ff36f3782 SHA256 f036ed153de912a1bb1466478e9ce0c9d4ecae55929f6b13490c3f47a242fc0d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk67IVIACgkQsiLx3HvNzgesHACfaz4isnFeiGC92w2J+JsZbF+G -RSkAoIL1KMMsci80BHvhZe90me6OQG3r -=/2sr +iEYEARECAAYFAk7F2W8ACgkQsiLx3HvNzgflUgCfQPhtmWarmOOwZqLjiggqx7+0 +HS4AoJtxYQmQ/X2pu3blQ1qVu2/chzUb +=HM0l -----END PGP SIGNATURE----- diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.5-dosym.patch b/sys-apps/pkgcore/files/pkgcore-0.7.5-dosym.patch new file mode 100644 index 000000000000..3f5896794725 --- /dev/null +++ b/sys-apps/pkgcore/files/pkgcore-0.7.5-dosym.patch @@ -0,0 +1,33 @@ +From 87e10f2a3b5d9867c104ffb4ed023bff0a64f218 Mon Sep 17 00:00:00 2001 +From: Brian Harring <ferringb@gmail.com> +Date: Thu, 17 Nov 2011 16:27:30 -0800 +Subject: [PATCH] allow dosym some-file directory/ despite PMS + +This conflicts with PMS (gentoo bug 379899), but neither the usage nor +spec is being corrected to rectify it. Rather than break things for +users, we now allow it. +--- + pkgcore/ebuild/eapi-bash/helpers/common/dohard | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/pkgcore/ebuild/eapi-bash/helpers/common/dohard b/pkgcore/ebuild/eapi-bash/helpers/common/dohard +index 13ebeda..d00946f 100755 +--- a/pkgcore/ebuild/eapi-bash/helpers/common/dohard ++++ b/pkgcore/ebuild/eapi-bash/helpers/common/dohard +@@ -8,9 +8,10 @@ check_args 2 + ln_option= + src_prefix= + if [[ ${HELPER_NAME} == dosym ]]; then +- # T while nonportable, is to ensure that if there is a directory +- # conflict, it doesn't just create the sym w/in +- ln_option=snT ++ ln_option=sn ++ if [[ ${2} == */ ]] || [[ -d $2 && ! -L $2 ]]; then ++ echo "QA: dosym target '$2' omits the filename target; see bug 379899" >&2 ++ fi + else + src_prefix="${D}" + fi +-- +1.7.8.rc1 + diff --git a/sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild new file mode 100644 index 000000000000..3e834b935745 --- /dev/null +++ b/sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild @@ -0,0 +1,76 @@ +# 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-r2.ebuild,v 1.1 2011/11/18 04:04:58 ferringb Exp $ + +EAPI="3" +DISTUTILS_SRC_TEST="setup.py" + +inherit distutils eutils + +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 dev-python/pyparsing )" + +DOCS="AUTHORS NEWS" + +pkg_setup() { + # disable snakeoil 2to3 caching... + unset PY2TO3_CACHEDIR + python_pkg_setup +} + +src_prepare() { + epatch "$FILESDIR/"$PN-$PV-force-python-binary.patch + epatch "$FILESDIR/"$PN-$PV-dosym.patch +} + +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 +} |