From: genone <genone@gentoo.org>
Date: Mon, 25 Apr 2005 01:48:12 +0000 (-0000)
Subject: finally deprecating qpkg and etcat
X-Git-Tag: gentoolkit-0.2.4.3~299
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8691f34c87a74b9b2a0c3f075ed8de59c704ad7f;p=gentoolkit.git

finally deprecating qpkg and etcat

svn path=/; revision=207
---

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index cfa4b32..efb7a46 100644
--- 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 0c36b46..2281646 100644
--- 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 a078046..cccdee0 100644
--- 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 f81f3e2..699f740 100755
--- 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