Fix dependencies; bug 151226

Package-Manager: portage-2.1.2_rc4-r3

4 files changed, 27 insertions, 24 deletions

diff --git a/app-doc/dox/ChangeLog b/app-doc/dox/ChangeLog
index d6a0ce68c51e..22fce062313b 100644
--- a/app-doc/dox/ChangeLog
+++ b/app-doc/dox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-doc/dox
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/dox/ChangeLog,v 1.10 2005/07/25 19:01:17 caleb Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/dox/ChangeLog,v 1.11 2007/01/02 15:55:10 masterdriverz Exp $
+
+  02 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org> dox-1.1.ebuild:
+  Fix dependencies; bug 151226
 
   25 Jul 2005; Caleb Tennis <caleb@gentoo.org> dox-1.1.ebuild:
   Change qt dep per bug #100235
diff --git a/app-doc/dox/Manifest b/app-doc/dox/Manifest
index 3190dfe7858e..d4d0585fb64c 100644
--- a/app-doc/dox/Manifest
+++ b/app-doc/dox/Manifest
@@ -1,16 +1,16 @@
-DIST dox-1.1.tar.gz 1353014
-EBUILD dox-1.1.ebuild 1675 RMD160 dad38b16d7e0a7fffe3465c94c75516a919b3e3f SHA1 adfcc5ec24be58c7fcf060bfc72827e31273edff SHA256 f1c9509ceb8032812f90506eedc24638d42dcb5b3c2d6ba423044a24d1d1daf4
-MD5 82dedb575d76d8c4b0170b09940f99d1 dox-1.1.ebuild 1675
-RMD160 dad38b16d7e0a7fffe3465c94c75516a919b3e3f dox-1.1.ebuild 1675
-SHA256 f1c9509ceb8032812f90506eedc24638d42dcb5b3c2d6ba423044a24d1d1daf4 dox-1.1.ebuild 1675
-MISC ChangeLog 1372 RMD160 3c10fd3e3a361dcca222597dd704878a8707a424 SHA1 371c6363b785218fd5e98369a779858bd37f6cdc SHA256 28cbcf52bf7139529fdb6d1393cad5bdee83119c81d4277fb61cb49780f668ef
-MD5 963afb782fea70ec5a2f8e529d8ff456 ChangeLog 1372
-RMD160 3c10fd3e3a361dcca222597dd704878a8707a424 ChangeLog 1372
-SHA256 28cbcf52bf7139529fdb6d1393cad5bdee83119c81d4277fb61cb49780f668ef ChangeLog 1372
+DIST dox-1.1.tar.gz 1353014 RMD160 f24191a47ff2a6fd588d3ea429fbe600e871fd19 SHA1 1c138cee60b913d95bc6753c1e70609f3a60ba81 SHA256 382a93068a36206b8cf95c886144af983703286f4721c4acfc1470fed4b3991a
+EBUILD dox-1.1.ebuild 1585 RMD160 f3a3b79bd61a9f78248864f0c16f22dd32f2d336 SHA1 37df7887ad081cf0610c24ef2606a42374559426 SHA256 b112682e5033437b927feeb590149460453855e6b2a07028be76cc067be396e5
+MD5 f1d9f8435922250dff50ad72f136d6a9 dox-1.1.ebuild 1585
+RMD160 f3a3b79bd61a9f78248864f0c16f22dd32f2d336 dox-1.1.ebuild 1585
+SHA256 b112682e5033437b927feeb590149460453855e6b2a07028be76cc067be396e5 dox-1.1.ebuild 1585
+MISC ChangeLog 1487 RMD160 ec77b224b39fa7bed278d3b34827c60e070f698a SHA1 6ee119c1d6180815c722ebb0e59dc8885fbc407d SHA256 a8fe6429285987b62edbd2a9c025e88c105d4a58ce834731a9a7b6ce9c26bc66
+MD5 3087996274bc1ade72f967b2a81ed923 ChangeLog 1487
+RMD160 ec77b224b39fa7bed278d3b34827c60e070f698a ChangeLog 1487
+SHA256 a8fe6429285987b62edbd2a9c025e88c105d4a58ce834731a9a7b6ce9c26bc66 ChangeLog 1487
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 MD5 38cacf4270b8a100918bf328ed9154d3 metadata.xml 314
 RMD160 25181cde297628576a9545bea3a76601485bfaf3 metadata.xml 314
 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 metadata.xml 314
-MD5 46c371b8b314b77cf01a760e07fb400d files/digest-dox-1.1 60
-RMD160 cc949e3bd325456c250d90781094897e53214e63 files/digest-dox-1.1 60
-SHA256 a67c1157f03ce8e910e72076538fe360cd27c28cd8acab86365ea7d462494d1a files/digest-dox-1.1 60
+MD5 44f6fac408fb8aede98eb087ae86f692 files/digest-dox-1.1 226
+RMD160 4ad089024c7853f8fa7a01f90a47b14a22b864ad files/digest-dox-1.1 226
+SHA256 2b019f13d5291cd617710621cea24af2b18866873ef838cc5cbe04b35b59699c files/digest-dox-1.1 226
diff --git a/app-doc/dox/dox-1.1.ebuild b/app-doc/dox/dox-1.1.ebuild
index a5605b880aac..096ff081d6c5 100644
--- a/app-doc/dox/dox-1.1.ebuild
+++ b/app-doc/dox/dox-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/dox/dox-1.1.ebuild,v 1.17 2005/07/25 19:01:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/dox/dox-1.1.ebuild,v 1.18 2007/01/02 15:55:10 masterdriverz Exp $
 
 inherit qt3
 
@@ -13,22 +13,20 @@ LICENSE="GPL-2"
 IUSE=""
 KEYWORDS="x86 ppc"
 
-RDEPEND="=x11-libs/qt-3*"
-DEPEND="www-misc/htdig"
+DEPEND="www-misc/htdig
+	$(qt_min_version 3)"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	cp configure configure.new
-	cat configure | sed -e 's:/opt/www/htdig/bin/htdig:/usr/bin/htdig:g' \
+	sed -e 's:/opt/www/htdig/bin/htdig:/usr/bin/htdig:g' \
 	-e 's:/opt/www/htdig/bin/htmerge:/usr/bin/htmerge:g' \
-	-e 's:/opt/www/cgi-bin/htsearch:/home/httpd/cgi-bin/htsearch:g' > configure.new
-	mv configure.new configure
+	-e 's:/opt/www/cgi-bin/htsearch:/home/httpd/cgi-bin/htsearch:g' -i configure
 }
 
 src_compile() {
-	./configure -prefix /usr || die
-	make all || die
+	econf || die
+	emake all || die
 	mv stl/stl.toc stl/STL.toc
 	mv stl/stl.index stl/STL.index
 	mv data/perl.toc data/Perl.toc
diff --git a/app-doc/dox/files/digest-dox-1.1 b/app-doc/dox/files/digest-dox-1.1
index a5dc03d747ec..4047100a46d7 100644
--- a/app-doc/dox/files/digest-dox-1.1
+++ b/app-doc/dox/files/digest-dox-1.1
@@ -1 +1,3 @@
 MD5 368afc1cc1cf1b56789dbb8754f38c50 dox-1.1.tar.gz 1353014
+RMD160 f24191a47ff2a6fd588d3ea429fbe600e871fd19 dox-1.1.tar.gz 1353014
+SHA256 382a93068a36206b8cf95c886144af983703286f4721c4acfc1470fed4b3991a dox-1.1.tar.gz 1353014