Updated and tested for bug 112557

(Portage version: 2.0.53_rc7)

6 files changed, 48 insertions, 25 deletions

diff --git a/dev-util/sourcenav/ChangeLog b/dev-util/sourcenav/ChangeLog
index 2c60c1d76f58..f70b4bc2ab4d 100644
--- a/dev-util/sourcenav/ChangeLog
+++ b/dev-util/sourcenav/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2005/05/01 18:21:57 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.15 2005/11/26 06:04:50 nerdboy Exp $
+
+  26 Nov 2005; Steve Arnold <nerdboy@gentoo.org> sourcenav-5.1.1.ebuild,
+  sourcenav-5.1.4.ebuild, sourcenav-5.2_beta2.ebuild:
+  Updated and tested for bug 112557; existing users without the problem
+  don't need to do anything.
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
   sourcenav-5.1.4.ebuild:
diff --git a/dev-util/sourcenav/Manifest b/dev-util/sourcenav/Manifest
index d3a27d642473..1e97844df146 100644
--- a/dev-util/sourcenav/Manifest
+++ b/dev-util/sourcenav/Manifest
@@ -1,10 +1,10 @@
-MD5 9b44ceac3e42ae2c276343e13124b919 metadata.xml 440
 MD5 5b4655814ca26316892035b4d134ee86 ChangeLog 2391
-MD5 c79d981a2d303009b003654adc6f67b1 sourcenav-5.1.4.ebuild 1068
-MD5 26b90da5e43e5a9f21ff8bab6a78998a sourcenav-5.2_beta2.ebuild 1256
-MD5 ca70d4ca089c784b1bda0bbb8ed1311d sourcenav-5.1.1.ebuild 1030
 MD5 f9473966bdccef516f67d1afcf91f0af files/digest-sourcenav-5.1.1 69
-MD5 cfa03d6dc43e431c308e100cfb0148c8 files/digest-sourcenav-5.1.4 142
+MD5 c7216746f2408527875ea2b91c3546b3 files/digest-sourcenav-5.1.4 142
+MD5 aa772944ff2487b5f0ad0bc74407615a files/digest-sourcenav-5.2_beta2 69
 MD5 e76d446608de5aa7eb565c5a13ea1fac files/sourcenav-5.1.1-gentoo.diff 19582
 MD5 96c9ea7073d13510db6b2b3387d795c8 files/sourcenav_destdir.patch 455
-MD5 aa772944ff2487b5f0ad0bc74407615a files/digest-sourcenav-5.2_beta2 69
+MD5 9b44ceac3e42ae2c276343e13124b919 metadata.xml 440
+MD5 b56a15f0d305aff5aca9988b65542600 sourcenav-5.1.1.ebuild 1367
+MD5 5ca038024bc658eeec08b1ac73ed0340 sourcenav-5.1.4.ebuild 1246
+MD5 0374bd9c0861f51e6f10fc00ff20879c sourcenav-5.2_beta2.ebuild 1346
diff --git a/dev-util/sourcenav/files/digest-sourcenav-5.1.4 b/dev-util/sourcenav/files/digest-sourcenav-5.1.4
index 081d0c414c3a..b0f5c5d9e257 100644
--- a/dev-util/sourcenav/files/digest-sourcenav-5.1.4
+++ b/dev-util/sourcenav/files/digest-sourcenav-5.1.4
@@ -1,2 +1,2 @@
-MD5 a0d03e062851adf1364a6adba0350219 sourcenav-5.1.4.tar.gz 11101823
 MD5 2158eaf6c6534c7b06dc03aebacadd19 sourcenav-5.1.4-gentoo.diff.gz 4560
+MD5 a0d03e062851adf1364a6adba0350219 sourcenav-5.1.4.tar.gz 11101823
diff --git a/dev-util/sourcenav/sourcenav-5.1.1.ebuild b/dev-util/sourcenav/sourcenav-5.1.1.ebuild
index a29d02414caa..da378190deaa 100644
--- a/dev-util/sourcenav/sourcenav-5.1.1.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.1.1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.1.1.ebuild,v 1.11 2004/07/15 00:11:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.1.1.ebuild,v 1.12 2005/11/26 06:04:50 nerdboy Exp $
+
+inherit eutils libtool toolchain-funcs
 
 S=${WORKDIR}/build
 
-DESCRIPTION="Source-Navigator is a source code analysis tool"
+DESCRIPTION="Source-Navigator is an IDE, as well as a source code analysis and reverse-engineering tool."
 SRC_URI="mirror://sourceforge/sourcenav/${P}.tar.gz"
 HOMEPAGE="http://sourcenav.sourceforge.net"
 
@@ -20,19 +22,26 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${WORKDIR}/${P}
-
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	export WANT_AUTOMAKE=1.5
+	export WANT_AUTOCONF=2.13
+	epatch ${FILESDIR}/${PF}-gentoo.diff|| die "epatch failed"
+	sed -i -e "s/PICFLAG =/PICFLAG = -fPIC/" Makefile.in
+	cd ${S}
+	../${P}/snavigator/autogen.sh
 }
 
 src_compile() {
 	../${P}/configure \
 		--host=${CHOST} \
 		--prefix=${SN} \
+		--exec-prefix=${SN} \
+		--bindir=${SN}/bin \
+		--sbindir=${SN}/sbin \
 		--mandir=${SN}/share/man \
 		--infodir=${SN}/share/info \
-		--datadir=${SN}/share || die
+		--datadir=${SN}/share || die "configure failed"
 
-	make all-snavigator || die
+	make || die "make failed"
 }
 
 src_install() {
diff --git a/dev-util/sourcenav/sourcenav-5.1.4.ebuild b/dev-util/sourcenav/sourcenav-5.1.4.ebuild
index bd4c1a3d08e3..8069a1030e91 100644
--- a/dev-util/sourcenav/sourcenav-5.1.4.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.1.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.1.4.ebuild,v 1.8 2005/05/01 18:21:57 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.1.4.ebuild,v 1.9 2005/11/26 06:04:50 nerdboy Exp $
+
+inherit eutils libtool toolchain-funcs
 
 S=${WORKDIR}/build
 
@@ -20,8 +22,7 @@ src_unpack() {
 	unpack ${A}
 	mkdir ${WORKDIR}/build
 	cd ${WORKDIR}/${P}
-
-	zcat ${DISTDIR}/${PF}-gentoo.diff.gz | patch -p0 || die
+	zcat ${DISTDIR}/${PF}-gentoo.diff.gz | patch -p0 || die "patch failed"
 }
 
 src_compile() {
@@ -29,9 +30,13 @@ src_compile() {
 	../${P}/configure \
 		--host=${CHOST} \
 		--prefix=${SN} \
+		--exec-prefix=${SN} \
+		--bindir=${SN}/bin \
+		--sbindir=${SN}/sbin \
 		--mandir=${SN}/share/man \
 		--infodir=${SN}/share/info \
-		--datadir=${SN}/share || die
+		--datadir=${SN}/share \
+		--libdir=${SN}/$(get_libdir) || die "configure failed"
 
 	make || die
 }
diff --git a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild b/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
index 08bfd1819467..ce7b1d8acee9 100644
--- a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.3 2004/11/12 17:44:05 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.4 2005/11/26 06:04:50 nerdboy Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ IUSE=""
 
 MY_P="5.2b2"
 S=${WORKDIR}/sourcenav-${MY_P}
-SB=${WORKDIR}/build
+SB=${WORKDIR}/snbuild
 SN="/opt/sourcenav"
 
 DESCRIPTION="Source-Navigator is a source code analysis and software development tool"
@@ -25,16 +25,20 @@ DEPEND=">=sys-libs/glibc-2.2.4
 
 src_unpack() {
 	unpack ${A}
-	mkdir ${SB} || die "mkdir build failed"
+#	mkdir ${SB} || die "mkdir build failed"
 	cd ${S}
 	epatch ${FILESDIR}/sourcenav_destdir.patch || die "epatch failed"
 }
 
 src_compile() {
-	cd ${SB}
-	../sourcenav-${MY_P}/configure \
+	cd ${S}
+#	../sourcenav-${MY_P}/configure \
+	./configure \
 		--host=${CHOST} \
 		--prefix=${SN} \
+		--bindir=${SN}/bin \
+		--sbindir=${SN}/sbin \
+		--exec-prefix=${SN} \
 		--mandir=${SN}/share/man \
 		--infodir=${SN}/share/info \
 		--datadir=${SN}/share || die "configure failed"