Fix to deprecate qpkg and still have revdep-rebuild work properly. #108899, #109011

Package-Manager: portage-2.0.53_rc5

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index b8b89e937b3e7616264ada48d612bc3b1fa91186..7b2b89024c17582eccac0191b4a91a77a69e0099 100644 (file)
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/gentoolkit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.54 2005/10/11 23:43:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.55 2005/10/12 16:55:20 fuzzyray Exp $
+
+*gentoolkit-0.2.0-r2 (12 Oct 2005)
+
+  12 Oct 2005; Paul Varner <fuzzyray@gentoo.org>
+  +files/qpkg-deprecated.patch, +gentoolkit-0.2.0-r2.ebuild:
+  Fix to deprecate qpkg and still have revdep-rebuild work properly. #108899,
+  #109011
 
 *gentoolkit-0.2.0-r1 (11 Oct 2005)
 

diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index d3983cdae1b189bf436d4b67f542d0904a51b45f..117605c3580afa0e3e4157eeb5f80102d812f7b2 100644 (file)
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e5a30ed579eb211c506299b6e412b693 ChangeLog 30349
+MD5 058c2c7990a1c59ddcd9736a0e47269c ChangeLog 30586
 MD5 99dee3ece4f06bd49f471db77a5cea21 files/digest-gentoolkit-0.2.0 67
 MD5 99dee3ece4f06bd49f471db77a5cea21 files/digest-gentoolkit-0.2.0-r1 67
+MD5 99dee3ece4f06bd49f471db77a5cea21 files/digest-gentoolkit-0.2.0-r2 67
 MD5 954e1ce7c864a7594fbbd8229658009b files/digest-gentoolkit-0.2.1_pre7 72
 MD5 d3df6295d0496f3d71b3621271f23172 files/digest-gentoolkit-0.2.1_pre8 72
 MD5 c5f0ee94504ceba66944b93e3db772d3 files/glsa.py-revmatch.diff 796
+MD5 35d6ebb9b58acec73ac1c363df947347 files/qpkg-deprecated.patch 1870
 MD5 2a64dd5b5e7e57ffc34102eca6b936b3 files/qpkg-security-fix-68846.diff 645
 MD5 5ad84678a1f3d0083fa5070c6d19c942 gentoolkit-0.2.0-r1.ebuild 1113
+MD5 ad83622458c94fa02115476fc36ea276 gentoolkit-0.2.0-r2.ebuild 1339
 MD5 83de6e1010084bfb0ed83caa6c522d5d gentoolkit-0.2.0.ebuild 1007
 MD5 3a2dc1dfe86c39e8537ee76067306f82 gentoolkit-0.2.1_pre7.ebuild 1464
 MD5 25c8a9c300866914596368ff94306e29 gentoolkit-0.2.1_pre8.ebuild 1464
 MD5 c36d3e9465a96d7220228d2ef5457bd3 metadata.xml 451
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDTE6ngIKl8Uu19MoRAmlgAJ9xyrpzzLrKoa04Ih+vLJtPLq0JzgCfWaAU
-KZOgUK/2XMoI304bf1Khzx4=
-=gp6C
------END PGP SIGNATURE-----

diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0-r2 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0-r2
new file mode 100644 (file)
index 0000000..ed9d306
--- /dev/null
+++ b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0-r2
@@ -0,0 +1 @@
+MD5 f9aac45f0f67f1f0de651c0cc9ebc16f gentoolkit-0.2.0.tar.gz 61687

diff --git a/app-portage/gentoolkit/files/qpkg-deprecated.patch b/app-portage/gentoolkit/files/qpkg-deprecated.patch
new file mode 100644 (file)
index 0000000..de687ee
--- /dev/null
+++ b/app-portage/gentoolkit/files/qpkg-deprecated.patch
@@ -0,0 +1,41 @@
+Only in gentoolkit-0.2.0-r2: .svn
+diff -ur gentoolkit-0.2.0-r1/makedefs.mak gentoolkit-0.2.0-r2/makedefs.mak
+--- gentoolkit-0.2.0-r1/makedefs.mak   2004-10-10 16:48:11.000000000 -0500
++++ gentoolkit-0.2.0-r2/makedefs.mak   2005-10-12 11:30:42.000000000 -0500
+@@ -6,8 +6,8 @@
+ 
+ # Override this on command line when making a release, ie 'dist'
+ 
+-VERSION=0.2.0_pre10
+-RELEASE_TAG=
++VERSION=0.2.0
++RELEASE_TAG=-r2
+ PYVERSION="`python-config | sed 's/-l//' | sed 's/ -lm.*//'`"
+ DESTDIR=
+ 
+diff -ur gentoolkit-0.2.0-r1/src/qpkg/Makefile gentoolkit-0.2.0-r2/src/qpkg/Makefile
+--- gentoolkit-0.2.0-r1/src/qpkg/Makefile      2004-10-10 16:48:10.000000000 -0500
++++ gentoolkit-0.2.0-r2/src/qpkg/Makefile      2005-10-12 11:07:34.000000000 -0500
+@@ -14,7 +14,7 @@
+       cp {Makefile,README,AUTHORS,ChangeLog,TODO,qpkg,qpkg.1} ../../${distdir}/src/qpkg/
+ 
+ install:
+-      install -m 0755 qpkg $(bindir)/
+       install -d $(docdir)/qpkg       
+-      install -m 0644 {README,AUTHORS,ChangeLog} $(docdir)/qpkg/
+-      install -m 0644 qpkg.1 $(mandir)/
++      install -d $(DESTDIR)/usr/lib/gentoolkit/bin/
++      install -m 0755 qpkg $(DESTDIR)/usr/lib/gentoolkit/bin/
++      install -m 0644 {README,AUTHORS,ChangeLog,qpkg.1} $(docdir)/qpkg/
+diff -ur gentoolkit-0.2.0-r1/src/revdep-rebuild/revdep-rebuild gentoolkit-0.2.0-r2/src/revdep-rebuild/revdep-rebuild
+--- gentoolkit-0.2.0-r1/src/revdep-rebuild/revdep-rebuild      2004-10-10 16:48:11.000000000 -0500
++++ gentoolkit-0.2.0-r2/src/revdep-rebuild/revdep-rebuild      2005-10-12 11:02:29.000000000 -0500
+@@ -209,7 +209,7 @@
+               echo -n >$LLIST.4_packages_raw
+               echo -n >$LLIST.4_package_owners
+               cat $LLIST.3_rebuild | while read FILE ; do
+-                      PKG="$(qpkg -nc -f "$FILE")"
++                      PKG="$(/usr/lib/gentoolkit/bin/qpkg -nc -f "$FILE")"
+                       if [ -z "$PKG" ] ; then
+                               echo -n -e "\n  ${RD}*** $FILE not owned by any package is broken! ***${NO}"
+                               echo "$FILE -> (none)" >> $LLIST.4_package_owners

diff --git a/app-portage/gentoolkit/gentoolkit-0.2.0-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.0-r2.ebuild
new file mode 100644 (file)
index 0000000..b83cafd
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.2.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.0-r2.ebuild,v 1.1 2005/10/12 16:55:20 fuzzyray Exp $
+
+inherit 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 http://dev.gentoo.org/~genone/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~ppc-macos"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 ppc-macos sh"
+
+DEPEND=">=sys-apps/portage-2.0.51
+       >=dev-lang/python-2.2
+       >=dev-lang/perl-5.6
+       >=sys-apps/grep-2.4
+       sys-apps/debianutils"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/qpkg-deprecated.patch
+}
+
+src_install() {
+       make DESTDIR=${D} install-gentoolkit || die
+}
+
+pkg_postinst() {
+       einfo "The following older scripts have been removed in this release:"
+       einfo "    dep-clean, ewhich, mkebuild, pkg-clean, pkg-size"
+       echo
+       ewarn "The qpkg tool is deprecated in favor of equery and"
+       ewarn "is no longer installed in ${ROOT}usr/bin in this release."
+       ewarn "It is still available in ${ROOT}usr/lib/gentoolkit/bin/"
+       ewarn "if you *really* want to use it."
+       echo
+}