added debug USE flag, fix for bug 119580, reworked for modular X

Package-Manager: portage-2.1_pre7-r5

3 files changed, 52 insertions, 12 deletions

diff --git a/dev-util/sourcenav/ChangeLog b/dev-util/sourcenav/ChangeLog
index f70b4bc2ab4d..f8c6d88d03f8 100644
--- a/dev-util/sourcenav/ChangeLog
+++ b/dev-util/sourcenav/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/sourcenav
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.15 2005/11/26 06:04:50 nerdboy Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.16 2006/04/24 02:43:21 nerdboy Exp $
+
+  24 Apr 2006; Steve Arnold <nerdboy@gentoo.org> sourcenav-5.2_beta2.ebuild:
+  added debug USE flag, fix for bug 119580, reworked for modular X
 
   26 Nov 2005; Steve Arnold <nerdboy@gentoo.org> sourcenav-5.1.1.ebuild,
   sourcenav-5.1.4.ebuild, sourcenav-5.2_beta2.ebuild:
diff --git a/dev-util/sourcenav/Manifest b/dev-util/sourcenav/Manifest
index fa8338d88dba..a69af2e64e48 100644
--- a/dev-util/sourcenav/Manifest
+++ b/dev-util/sourcenav/Manifest
@@ -1,10 +1,30 @@
-MD5 fcd73d1387bf4707cb3616642afe0321 ChangeLog 2621
+MD5 91145aedbb922ffe93ebfed45c48aebf ChangeLog 2766
+RMD160 2da74ab985668bdc3bb6c574694d27bd7d79b11c ChangeLog 2766
+SHA256 5d0d254bd0b938235f538cd45d71e5985f7d0d911ee6d37550f9ce1049dfa19b ChangeLog 2766
 MD5 f9473966bdccef516f67d1afcf91f0af files/digest-sourcenav-5.1.1 69
+RMD160 3d313a95360a3920b81ee47d70442ee0b72e14a8 files/digest-sourcenav-5.1.1 69
+SHA256 1bea167aafa4cfababeb084f2b5b518c61d715a7522fb85407cdb945fbc9c4af files/digest-sourcenav-5.1.1 69
 MD5 c7216746f2408527875ea2b91c3546b3 files/digest-sourcenav-5.1.4 142
+RMD160 3786fcb470c427dc638945192dc51fe062f3b0a0 files/digest-sourcenav-5.1.4 142
+SHA256 e2a016bad775f38819bf8b6af0fc4ebbd1e6baf816081400b79592026c161f9e files/digest-sourcenav-5.1.4 142
 MD5 aa772944ff2487b5f0ad0bc74407615a files/digest-sourcenav-5.2_beta2 69
+RMD160 905a274dec679b906358418293c61c328a3345a1 files/digest-sourcenav-5.2_beta2 69
+SHA256 b30494ddc4116db4890a7028e8e69aa8851559ee6fdcf15279d7af3be41844c8 files/digest-sourcenav-5.2_beta2 69
 MD5 e76d446608de5aa7eb565c5a13ea1fac files/sourcenav-5.1.1-gentoo.diff 19582
+RMD160 751964abc412c0bc599b486681fc9a944fc32933 files/sourcenav-5.1.1-gentoo.diff 19582
+SHA256 fdd6b5c9b029dadd2b4fd389460c2042257a87767c35bb4cb93852b1d8e548d0 files/sourcenav-5.1.1-gentoo.diff 19582
 MD5 96c9ea7073d13510db6b2b3387d795c8 files/sourcenav_destdir.patch 455
+RMD160 d4ccf55b39869f2be931680c87fa7db05b9f5e34 files/sourcenav_destdir.patch 455
+SHA256 e62679456dfda54cf8268a813f0fa932b83c1cab0ea8467cae315180b8d281ca files/sourcenav_destdir.patch 455
 MD5 9b44ceac3e42ae2c276343e13124b919 metadata.xml 440
+RMD160 1abe25221723d019af0ecb4ede17037d383e6e60 metadata.xml 440
+SHA256 1ff54a7e138b26b1a4a02eb30c28843b47de2965a1f6375604367b554d62463f metadata.xml 440
 MD5 70fc27723830381f431999fdd4db6e4d sourcenav-5.1.1.ebuild 1366
+RMD160 a281315a3f5d600e2ee9b83c2aff2a8620e41497 sourcenav-5.1.1.ebuild 1366
+SHA256 9b29e3d4333360419f0dcc53ca08fda2b89529096cfbf550f35632d8ae06219e sourcenav-5.1.1.ebuild 1366
 MD5 c09d1e281094ce26fc7f1420187c7078 sourcenav-5.1.4.ebuild 1247
-MD5 0931818464ca026beb384e088982f6a1 sourcenav-5.2_beta2.ebuild 1348
+RMD160 c425fb600075dbfce9d0e1da771c1fbaeecc313a sourcenav-5.1.4.ebuild 1247
+SHA256 92fb564cd7ccbeb90521c2add5a73143002c3755442339e4d5ce2afa0fb4a958 sourcenav-5.1.4.ebuild 1247
+MD5 a2cecac70cd0b9d67847a57bc135f84a sourcenav-5.2_beta2.ebuild 1743
+RMD160 8d3e88adc7885d2536ce5ecb4f520007c7f4cb87 sourcenav-5.2_beta2.ebuild 1743
+SHA256 739b79c10de557990322ef3eef389db4b0eafee07410e7ba8cbc9a0a19a5be8f sourcenav-5.2_beta2.ebuild 1743
diff --git a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild b/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
index ce7b1d8acee9..4db44f9e0eb8 100644
--- a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.4 2005/11/26 06:04:50 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.5 2006/04/24 02:43:21 nerdboy Exp $
 
 inherit eutils
 
-IUSE=""
+IUSE="debug"
 
 MY_P="5.2b2"
 S=${WORKDIR}/sourcenav-${MY_P}
@@ -19,21 +19,37 @@ SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 
-RDEPEND="virtual/x11"
-DEPEND=">=sys-libs/glibc-2.2.4
-	${RDEPEND}"
+RDEPEND="|| (
+	    ( x11-libs/libXmu
+	    x11-libs/libXext
+	    x11-libs/libXp
+	    x11-libs/libX11
+	    x11-libs/libXt
+	    x11-libs/libSM
+	    x11-libs/libICE
+	    x11-libs/libXpm
+	    x11-libs/libXaw )
+	virtual/x11
+	)"
+DEPEND="${RDEPEND}
+	|| (
+	    ( x11-proto/xproto x11-proto/xextproto )
+	        virtual/x11
+	)"
 
 src_unpack() {
 	unpack ${A}
 #	mkdir ${SB} || die "mkdir build failed"
 	cd ${S}
 	epatch ${FILESDIR}/sourcenav_destdir.patch || die "epatch failed"
+	sed -i -e "s/relid'/relid/" tcl/unix/configure
+	sed -i -e "s/relid'/relid/" tk/unix/configure
 }
 
 src_compile() {
 	cd ${S}
 #	../sourcenav-${MY_P}/configure \
-	./configure \
+	./configure ${MY_CONF} \
 		--host=${CHOST} \
 		--prefix=${SN} \
 		--bindir=${SN}/bin \
@@ -41,7 +57,8 @@ src_compile() {
 		--exec-prefix=${SN} \
 		--mandir=${SN}/share/man \
 		--infodir=${SN}/share/info \
-		--datadir=${SN}/share || die "configure failed"
+		--datadir=${SN}/share \
+		$(use_enable debug symbols) || die "configure failed"
 
 	make || die "make failed"
 }