From: Paul Varner Date: Thu, 8 Apr 2010 22:34:30 +0000 (+0000) Subject: Revision bump to fix regression in eclean where metadata.dtd gets removed (Bug 313901). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad4dbe33f7cd1e5fdf1befcf100d5807eb797bd9;p=gentoo.git Revision bump to fix regression in eclean where metadata.dtd gets removed (Bug 313901). Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog index caad6a600434..95fdbed689e8 100644 --- a/app-portage/gentoolkit/ChangeLog +++ b/app-portage/gentoolkit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/gentoolkit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.187 2010/04/05 21:04:18 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.188 2010/04/08 22:34:30 fuzzyray Exp $ + +*gentoolkit-0.3.0_rc10-r1 (08 Apr 2010) + + 08 Apr 2010; Paul Varner + +gentoolkit-0.3.0_rc10-r1.ebuild, +files/eclean.313901.patch: + Revision bump to fix regression in eclean where metadata.dtd gets removed + (Bug 313901). *gentoolkit-0.3.0_rc10 (05 Apr 2010) diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest index 35ac9824b4b4..665b826bbeb4 100644 --- a/app-portage/gentoolkit/Manifest +++ b/app-portage/gentoolkit/Manifest @@ -1,6 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX eclean.313901.patch 1497 RMD160 21579445342977fe59a7a464605c963a43c59fa7 SHA1 daefcf1dde3c70b04d0bf528b88335656b48fe61 SHA256 2e825cb0ddfafcf139b9ae31c232e1f4b6f8401ca25070fe47c6ab3a4312f7be DIST gentoolkit-0.2.4.5.tar.gz 89084 RMD160 8f982737c11be05444af8e2d11ffc29f21e961bd SHA1 7186f6228f9eee75772010bdf6c5ccb783232bd9 SHA256 22072025124e5108b4f924645c7a084ff90c535d1ba642bbef193c7e143e7587 DIST gentoolkit-0.2.4.6.1.tar.gz 90135 RMD160 7cfe8a8a6e697bbab0d93ec6d82f5b0aee8bcc03 SHA1 82e8a785a753a9e86063dd4fff2f4f864e4224bb SHA256 d057ce14e037e313ae085ac70871a56bbc147efe9beae8fcf8c818afcaa63896 DIST gentoolkit-0.3.0_rc10.tar.gz 159126 RMD160 8cb87304ddb335892b4a9382fecbf365b4a8a716 SHA1 b3fa3eed17df600676ec1c3a0daa1510d3e2ab74 SHA256 ee274b16a374fcfd6c6a8fad774373fca483c58dc69bde324fdf98149c7a83a4 @@ -9,18 +7,12 @@ DIST gentoolkit-0.3.0_rc8.tar.gz 118976 RMD160 db7f8660f451a9489466e5de76bafd1a7 DIST gentoolkit-0.3.0_rc9.tar.gz 119944 RMD160 96e687ee3d74182518b42230f9306675db474596 SHA1 11a781acfe669f80507b45992861ff43a59c6405 SHA256 e30e524eba74d73e25fe92cf67690de8cbce6403e0c8dd78615f2d3c4a55506e EBUILD gentoolkit-0.2.4.5.ebuild 1639 RMD160 7d71bc0f2c2e9a7fc0b2799d1ce6483e8cce033c SHA1 60daaae341cbd6d01210c244db5795fecd10b3d9 SHA256 f5624b9cf53fae444389b4f051017b50ad574c923ed02a292b9779119641262b EBUILD gentoolkit-0.2.4.6.1.ebuild 1736 RMD160 c258febb3765a2399a4d73f22e4f0dfd646b0211 SHA1 7ded40a609553fe54ed28bd64fe00dbe957d5d95 SHA256 be3837a25ba7d931aeb3123a8e44394bf7cdb74be048a173b27257dda70517b9 +EBUILD gentoolkit-0.3.0_rc10-r1.ebuild 1906 RMD160 00958f347b441ae333fd54b447c6dfac08605f7d SHA1 073374bc37068c1c9571a5da70fb23d85d6d6e7b SHA256 676c98df6adc61581ca5169673fc991dede1e14afa855ca39faa654d0291a4f1 EBUILD gentoolkit-0.3.0_rc10.ebuild 1830 RMD160 2a43c74b5b0601e7d09c788430761b849b091928 SHA1 5fbebb0b3d88f3010fda2a3faa87c82d8f898b41 SHA256 5929e79c4d17fe8a039326340ec6a2b96bef61dd879a0788173c881f75ee8ce0 EBUILD gentoolkit-0.3.0_rc7.ebuild 2391 RMD160 bd43add56b5e20a451f56bf67161bf3c75b493f8 SHA1 cc0f32311f237ed8f2c09188689500152597988b SHA256 b3a8bffc78f31fcdb37a8719b4772cddee69ee66b04d2af13002b52543352ba9 EBUILD gentoolkit-0.3.0_rc8-r1.ebuild 2508 RMD160 15b442bc47bde24913e53f2d25cc8c8bce42c7bd SHA1 6f54e49645eb27d31f60f283cdd8b75c9e74c85a SHA256 a22e20c03c858d998b2892a9acc50dc4819a5d821a5332b3c2211a269f9c0761 EBUILD gentoolkit-0.3.0_rc8.ebuild 2326 RMD160 6ff2fdecc09ec0f94cb66531f867d65554da7b93 SHA1 d2550513c4329475c3c4bac5c18e92f0c861da43 SHA256 fe75f7ce8b56eee393c868b21d0ab4a972b0ee47137af0d826038cbd1e79fd85 EBUILD gentoolkit-0.3.0_rc9.ebuild 2505 RMD160 4083c0d7927de4efb34fe0f7917878e8cc3eb724 SHA1 303afc844229c33c036f5ba26926f822631bcbe2 SHA256 7060ab10e0d803a56533ebd6f4d450db0a9ac452d7a375ffba78a2ecc6364386 EBUILD gentoolkit-9999.ebuild 1865 RMD160 af3f6f13a29a702f6c847d21c10e5e0abe76b7f6 SHA1 76af94e9557d24e9972b870c1bac950c297a8975 SHA256 2da185769c4b32463dd12e1600bde50cb63f77d50a9f336b6b08d45c8f8ca061 -MISC ChangeLog 55843 RMD160 a28c423041890e1e34788d00e4a0a26d73a4ba6c SHA1 1e1ca5e42542ff4c9bfebc9068169aa68cf731d2 SHA256 7655f3ffb274a54c694e0064700d0d08c7f40474676feb49f648cef617fd2f1e +MISC ChangeLog 56093 RMD160 dbda285575c0201e4da2f5a753348e494cb60abb SHA1 1a30ed6f7df20d300aa10858431e22ecb051e791 SHA256 818fccce29687ee73e291fa2a3d87bb16b3e4e2a03d2d5cf2c9428b62a3bd34b MISC metadata.xml 451 RMD160 b1cce9123da273149c731793696937f9b3d02c60 SHA1 6126c34edcb6ed5f4274e060881378cc1cf10757 SHA256 1a2def4d28f69d6bffeb0b09e97ce53e6822e457d5d9308000a1010dca32abeb ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAku6UFwACgkQixe2jn+ufTixxACePO1LBshNpGx6cpGWjT9r5eWT -qZsAoIWtrGKR1VhIHGV3kWJixQw1Dtxe -=5MEs ------END PGP SIGNATURE----- diff --git a/app-portage/gentoolkit/files/eclean.313901.patch b/app-portage/gentoolkit/files/eclean.313901.patch new file mode 100644 index 000000000000..2f83bc85e3a8 --- /dev/null +++ b/app-portage/gentoolkit/files/eclean.313901.patch @@ -0,0 +1,40 @@ +Index: pym/gentoolkit/eclean/exclude.py +=================================================================== +--- pym/gentoolkit/eclean/exclude.py (revision 766) ++++ pym/gentoolkit/eclean/exclude.py (working copy) +@@ -223,6 +223,7 @@ + pkgname = cp.split('/')[1] + p.add(pkgname) + if 'packages' in exclude: ++ for cp in exclude['packages']: + pkgname = cp.split('/')[1] + p.add(pkgname) + if 'anti-packages' in exclude: +Index: pym/gentoolkit/eclean/cli.py +=================================================================== +--- pym/gentoolkit/eclean/cli.py (revision 766) ++++ pym/gentoolkit/eclean/cli.py (working copy) +@@ -463,6 +463,11 @@ + if options['verbose']: + options['verbose-output'] = output.einfo + # parse the exclusion file ++ if not 'exclude-file' in options: ++ # set it to the default exclude file if it exists ++ exclude_file = "/etc/%s/%s.exclude" % (__productname__ , action) ++ if os.path.isfile(exclude_file): ++ options['exclude-file'] = exclude_file + if 'exclude-file' in options: + try: + exclude = parseExcludeFile(options['exclude-file'], +@@ -475,10 +480,7 @@ + "See format of this file in `man %s`" % __productname__), file=sys.stderr) + sys.exit(1) + else: +- exclude_file = "/etc/%s/%s.exclude" % (__productname__ , action) +- if os.path.isfile(exclude_file): +- options['exclude-file'] = exclude_file +- exclude={} ++ exclude = {} + # security check for non-pretend mode + if not options['pretend'] and portage.secpass == 0: + print( pp.error( diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0_rc10-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0_rc10-r1.ebuild new file mode 100644 index 000000000000..7ec67be3c9ed --- /dev/null +++ b/app-portage/gentoolkit/gentoolkit-0.3.0_rc10-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0_rc10-r1.ebuild,v 1.1 2010/04/08 22:34:30 fuzzyray Exp $ + +EAPI="2" +SUPPORT_PYTHON_ABIS="1" +DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS="1" +RESTRICT_PYTHON_ABIS="2.[45]" + +inherit distutils python eutils + +DESCRIPTION="Collection of administration scripts for Gentoo" +HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +# Drop ~sparc-fbsd ~x86-fbsd due to app-misc/realpath dependency +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +DEPEND="sys-apps/portage + >=dev-lang/python-2.6[xml] + !!>=dev-lang/python-2.6[-xml]" +RDEPEND="${DEPEND} + app-misc/realpath + sys-apps/gawk + sys-apps/grep" + +src_prepare() { + epatch "${FILESDIR}/eclean.313901.patch" +} + +distutils_src_compile_pre_hook() { + echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version + VERSION="${PVR}" "$(PYTHON)" setup.py set_version +} + +src_install() { + python_convert_shebangs -r "" build-*/scripts-* + distutils_src_install + + # Create cache directory for revdep-rebuild + dodir /var/cache/revdep-rebuild + keepdir /var/cache/revdep-rebuild + fowners root:root /var/cache/revdep-rebuild + fperms 0700 /var/cache/revdep-rebuild + + # Can distutils handle this? + dosym eclean /usr/bin/eclean-dist + dosym eclean /usr/bin/eclean-pkg +} + +pkg_postinst() { + distutils_pkg_postinst + + # Make sure that our ownership and permissions stuck + chown root:root "${ROOT}/var/cache/revdep-rebuild" + chmod 0700 "${ROOT}/var/cache/revdep-rebuild" + + einfo + einfo "For further information on gentoolkit, please read the gentoolkit" + einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml" + einfo + einfo "Another alternative to equery is app-portage/portage-utils" +}