From: Paul Varner Date: Mon, 1 Mar 2010 19:58:06 +0000 (+0000) Subject: Revision bump to add patch to fully fix Bug 143498 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=de0233767ae001f46f38da33c705de571849d00c;p=gentoo.git Revision bump to add patch to fully fix Bug 143498 Package-Manager: portage-2.2_rc63/cvs/Linux i686 --- diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog index d92f5875170c..fd6e028cbf12 100644 --- a/app-portage/gentoolkit/ChangeLog +++ b/app-portage/gentoolkit/ChangeLog @@ -1,6 +1,12 @@ # 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.179 2010/02/18 19:58:12 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.180 2010/03/01 19:58:04 fuzzyray Exp $ + +*gentoolkit-0.2.4.6-r1 (01 Mar 2010) + + 01 Mar 2010; Paul Varner + +gentoolkit-0.2.4.6-r1.ebuild, +files/revdep-rebuild.143498.patch: + Revision bump to add patch to fully fix Bug 143498 *gentoolkit-0.3.0_rc9 (18 Feb 2010) *gentoolkit-0.2.4.6 (18 Feb 2010) diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest index 1e925f367361..eb7abe52fb33 100644 --- a/app-portage/gentoolkit/Manifest +++ b/app-portage/gentoolkit/Manifest @@ -1,14 +1,16 @@ +AUX revdep-rebuild.143498.patch 992 RMD160 fd3df3f527afcb091828374b208717fc3b56659b SHA1 1e8f5dec0421d8c376d9c0fe7bb9b03d3c8aa3c6 SHA256 a0137c389a82126f6daa812ae1ff441929e084fd91f205bebb1b017d7fd7b590 DIST gentoolkit-0.2.4.5.tar.gz 89084 RMD160 8f982737c11be05444af8e2d11ffc29f21e961bd SHA1 7186f6228f9eee75772010bdf6c5ccb783232bd9 SHA256 22072025124e5108b4f924645c7a084ff90c535d1ba642bbef193c7e143e7587 DIST gentoolkit-0.2.4.6.tar.gz 89938 RMD160 a2d4facbb683b1f0c52c3e442cc978ece817471f SHA1 514cb7c53089ae3bf98bbe8e31a1a23f15ab9160 SHA256 c197e733445c56d97750089d652735e157326df2dd0f0992ba1b8785505178cb DIST gentoolkit-0.3.0_rc7.tar.gz 100911 RMD160 076aca565a17f40c6087c90b4c568599248f6d01 SHA1 a34ae83de968be7a8a61b1bb660c199bbb94005a SHA256 856f2372bd6e9315dd094a7860d56fbeb6f319e3075277f969eb1e4e13843d0c DIST gentoolkit-0.3.0_rc8.tar.gz 118976 RMD160 db7f8660f451a9489466e5de76bafd1a7cb38061 SHA1 ce717ef1215f5f144b76662aeca3ba3fcf102cf2 SHA256 36c69107a849b3d598c3c100fbeaa596a9cbc0f51398b7061b462e9ca8b1aa5c 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-r1.ebuild 1800 RMD160 420f29fa620b5ae6df5add1a5aecf9faf4abe28f SHA1 9197d5e22920b9d983d7849877f207e962ed3b5d SHA256 bf59eb17aa1aadfd673a8f94f05d1f44880db0887b0f03f47e90e8661a8bd58a EBUILD gentoolkit-0.2.4.6.ebuild 1728 RMD160 15e48b0d73dc3758a84c560b08ed0dad52cdc3ec SHA1 ddca6553e769696d2501662e4889400d3e54efb5 SHA256 e0ea16aa2e40e9edf4771af200da5cb41bfa9ab5edbafc5d9286d2a19111b3ee EBUILD gentoolkit-0.3.0_rc7.ebuild 2391 RMD160 bd43add56b5e20a451f56bf67161bf3c75b493f8 SHA1 cc0f32311f237ed8f2c09188689500152597988b SHA256 b3a8bffc78f31fcdb37a8719b4772cddee69ee66b04d2af13002b52543352ba9 EBUILD gentoolkit-0.3.0_rc8-r1.ebuild 2493 RMD160 09703bee7703e25cd2c81392a3b6f6491c9d11cf SHA1 953aa72db6936dfbbbd943d9ea0490d7b38c61fd SHA256 a561b63597f927271fa2e1a6d19785b15cbc8c04a1bccaedb941edf6a4572924 EBUILD gentoolkit-0.3.0_rc8.ebuild 2311 RMD160 e380a8a5955d84a36b4a5f02645645cae5134d9a SHA1 9f76ebe7af4527942d283ded239b63b3c45106a0 SHA256 0a4868be93c3b796ea6a8e2aeba984d75ea49ed815b7e1f1c809a8fe71cabac5 EBUILD gentoolkit-0.3.0_rc9.ebuild 2490 RMD160 a7f152b7e1e2656f86095b3c61d79beab28307f6 SHA1 a20dc852d5a1fb19fbf53121cdfed42000df22c5 SHA256 d0086d840269ffb49dd6e780203c125077f64dd5c6b455bee0677d33cf6aa452 EBUILD gentoolkit-9999.ebuild 1912 RMD160 eb050e3ef74cce526969faea3d1f6c3845e24f92 SHA1 ff2e05f7455294a306772f40359381641ba3bd09 SHA256 eae8e361c8b790acf2c518ff7f9058920abe59a914df23de8ba2e217e47f2b2e -MISC ChangeLog 54172 RMD160 78af7413643215c209adf8677f70a65eb27af0ee SHA1 fb3bf2f831646541b564ad9d7d3db3c9571367bb SHA256 93035d417e2b42c20bcc7e18fdd2f015d331176ad1b6b20574b078bb8e72de38 +MISC ChangeLog 54382 RMD160 373097b212e49ab509bf8f218621f922241568bd SHA1 fbc3773edbcaf1389b24c91d1dd88fc828e1ce36 SHA256 541b6ea027a2685a36ab2ded861c700253ff8ae16a94f354e19d7d3f20ad5953 MISC metadata.xml 451 RMD160 b1cce9123da273149c731793696937f9b3d02c60 SHA1 6126c34edcb6ed5f4274e060881378cc1cf10757 SHA256 1a2def4d28f69d6bffeb0b09e97ce53e6822e457d5d9308000a1010dca32abeb diff --git a/app-portage/gentoolkit/files/revdep-rebuild.143498.patch b/app-portage/gentoolkit/files/revdep-rebuild.143498.patch new file mode 100644 index 000000000000..09558774716b --- /dev/null +++ b/app-portage/gentoolkit/files/revdep-rebuild.143498.patch @@ -0,0 +1,22 @@ +--- gentoolkit-0.2.4.6/src/revdep-rebuild/revdep-rebuild (revision 745) ++++ gentoolkit-0.2.4.6/src/revdep-rebuild/revdep-rebuild (working copy) +@@ -18,7 +18,7 @@ + + # Readonly variables: + declare -r APP_NAME="${0##*/}" # The name of this application +-declare -r VERSION="svn" ++declare -r VERSION="genscripts-r230" + declare -r OIFS="$IFS" # Save the IFS + declare -r ENV_FILE=0_env.rr # Contains environment variables + declare -r FILES_FILE=1_files.rr # Contains a list of files to search +@@ -757,8 +757,8 @@ + # FIXME: I hate duplicating code + # Only rebuild for direct dependencies + MISSING_LIBS=$( +- expr="/$SONAME_SEARCH/s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p" +- sort -u <<< "$ldd_output" | sed -n "$expr" ++ expr="s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p" ++ sort -u <<< "$ldd_output" | grep -E "$SONAME | sed -n "$expr" + ) + REQUIRED_LIBS=$( + expr='s/^[[:space:]]*NEEDED[[:space:]]*\([^[:space:]]*\).*/\1/p'; diff --git a/app-portage/gentoolkit/gentoolkit-0.2.4.6-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.4.6-r1.ebuild new file mode 100644 index 000000000000..374c5a28dca4 --- /dev/null +++ b/app-portage/gentoolkit/gentoolkit-0.2.4.6-r1.ebuild @@ -0,0 +1,62 @@ +# 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.2.4.6-r1.ebuild,v 1.1 2010/03/01 19:58:04 fuzzyray Exp $ + +EAPI=2 + +inherit eutils python + +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 http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +# Drop ~m68k ~s390 ~sh ~sparc-fbsd ~x86-fbsd due to app-misc/realpath dependency +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +DEPEND="sys-apps/portage + dev-lang/python[xml] + dev-lang/perl + sys-apps/grep" +RDEPEND="${DEPEND} + app-misc/realpath" +RESTRICT="test" + +src_prepare() { + epatch "${FILESDIR}/revdep-rebuild.143498.patch" +} + +src_install() { + emake DESTDIR="${D}" install-gentoolkit || die "install-gentoolkit failed" + + # 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 +} + +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" + + python_mod_optimize /usr/lib/gentoolkit + + einfo + elog "The default location for revdep-rebuild files has been moved" + elog "to /var/cache/revdep-rebuild when run as root." + einfo + einfo "Another alternative to equery is app-portage/portage-utils" + einfo + einfo "For further information on gentoolkit, please read the gentoolkit" + einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml" + einfo +} + +pkg_postrm() { + python_mod_cleanup /usr/lib/gentoolkit +}