finally deprecating qpkg and etcat

svn path=/; revision=207

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index cfa4b324c2a0c180ed359852b71a26b8a9c09686..efb7a46c80722dc4baca398d911b821149d177cd 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-25 Marius Mauch <genone@gentoo.org>
+       * qpkg: moving to /usr/share/doc/gentoolkit-*/deprecated
+       * etcat: moving to /usr/share/doc/gentoolkit-*/deprecated
+       * revdep-rebuild: replacing qpkg call with equivalent grep/sed call
+
 2005-04-07 Marius Mauch <genone@gentoo.org>
        * euse: fixed bugs 74344, 75525 and 84521
        * euse: add better support for cascaded profiles

diff --git a/trunk/src/etcat/Makefile b/trunk/src/etcat/Makefile
index 0c36b4652d0ba9938c9a3404ac4820a4ab95ce2e..2281646da14f38ed77940167ceac3bbd03a7df32 100644 (file)
--- a/trunk/src/etcat/Makefile
+++ b/trunk/src/etcat/Makefile
@@ -13,7 +13,6 @@ dist:
        cp Makefile AUTHORS README TODO ChangeLog etcat etcat.1 ../../$(distdir)/src/etcat
 
 install:
-       install -m 0755 etcat $(bindir)/
-       install -d $(docdir)/etcat
-       install -m 0644 README AUTHORS $(docdir)/etcat/
-       install -m 0644 etcat.1 $(mandir)/
+       install -d $(docdir)/deprecated/etcat
+       install -m 0755 etcat $(docdir)/deprecated/etcat/
+       install -m 0644 etcat.1 README AUTHORS $(docdir)/deprecated/etcat/

diff --git a/trunk/src/qpkg/Makefile b/trunk/src/qpkg/Makefile
index a078046306bc553dba9004e5b688943d70651910..cccdee05e586300fc54643dd26af4428bac0589c 100644 (file)
--- a/trunk/src/qpkg/Makefile
+++ b/trunk/src/qpkg/Makefile
@@ -14,7 +14,6 @@ dist:
        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 $(docdir)/deprecated/qpkg
+       install -m 0755 qpkg $(docdir)/deprecated/qpkg/
+       install -m 0644 qpkg.1 README AUTHORS ChangeLog $(docdir)/deprecated/qpkg/

diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild
index f81f3e2f84e787d7f0318aa8d1c87e98cd66b019..699f740394e6a189d8035708f4cc5e0a82a91d84 100755 (executable)
--- a/trunk/src/revdep-rebuild/revdep-rebuild
+++ b/trunk/src/revdep-rebuild/revdep-rebuild
@@ -209,7 +209,7 @@ if $PACKAGE_NAMES ; then
                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=$(fgrep -l $FILE /var/db/pkg/*/*/CONTENTS|sed -e 's:/var/db/pkg/\(.*\)/CONTENTS:\1:g' -e "s:-r[0-9]\+$::" -e "s:-[0-9][^-]*$::")
                        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