remove broken ebuild, bug 165542. Version bump, remove gnuconfig_update usage, bug 160184. Thanks to plaes at IRC for testing it

Package-Manager: portage-2.1.2-r8

6 files changed, 114 insertions, 54 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 1cd919323859..4b4355722b9b 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.64 2007/02/05 14:55:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.65 2007/02/07 10:56:12 armin76 Exp $
+
+*nspr-4.6.5 (07 Feb 2007)
+*nspr-4.6.4-r2 (07 Feb 2007)
+
+  07 Feb 2007; Raúl Porcel <armin76@gentoo.org>
+  -files/nspr-4.6.4-config-2.patch, -nspr-4.6.4-r1.ebuild,
+  +nspr-4.6.4-r2.ebuild, +nspr-4.6.5.ebuild:
+  remove broken ebuild, bug 165542. Version bump, remove gnuconfig_update
+  usage, bug 160184. Thanks to plaes at IRC for testing it.
 
   05 Feb 2007; Raúl Porcel <armin76@gentoo.org> -nspr-4.1.2.ebuild,
   -nspr-4.3.ebuild, -nspr-4.4.1.ebuild, -nspr-4.4.1-r2.ebuild,
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.4-r1 b/dev-libs/nspr/files/digest-nspr-4.6.4-r2
index bda30b21c53b..bda30b21c53b 100644
--- a/dev-libs/nspr/files/digest-nspr-4.6.4-r1
+++ b/dev-libs/nspr/files/digest-nspr-4.6.4-r2
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.5 b/dev-libs/nspr/files/digest-nspr-4.6.5
new file mode 100644
index 000000000000..e55cae1f7da6
--- /dev/null
+++ b/dev-libs/nspr/files/digest-nspr-4.6.5
@@ -0,0 +1,3 @@
+MD5 9bf15436496cb6bd96c1939f3ffb839f nspr-4.6.5.tar.gz 1284497
+RMD160 d01785db70bf949aefb09f0095911794f31b7769 nspr-4.6.5.tar.gz 1284497
+SHA256 335c5e541af65632a57b7ea70b4c47e3e1f33e758cd146ff7154f547ef836c74 nspr-4.6.5.tar.gz 1284497
diff --git a/dev-libs/nspr/files/nspr-4.6.4-config-2.patch b/dev-libs/nspr/files/nspr-4.6.4-config-2.patch
deleted file mode 100644
index 843927c25636..000000000000
--- a/dev-libs/nspr/files/nspr-4.6.4-config-2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.in.org	2007-01-05 23:07:18.000000000 +0200
-+++ configure.in	2007-01-05 23:37:36.000000000 +0200
-@@ -409,7 +409,8 @@ if test "$target" != "$host"; then
- 
-     AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--        [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
-+        [ac_cv_prog_host_cc_works=1
-+	AC_MSG_RESULT([yes])],
-         AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
- 
-     CC=$_SAVE_CC
-@@ -2155,9 +2156,8 @@ case $target in
- *-darwin*)
-     ;;
- *)
--    AC_CHECK_LIB(dl, dlopen,
--        AC_CHECK_HEADER(dlfcn.h,
--            OS_LIBS="-ldl $OS_LIBS"))
-+    AC_CHECK_HEADER(dlfcn.h)
-+    AC_CHECK_LIB(dl, dlopen, [OS_LIBS="-ldl $OS_LIBS"])
-     ;;
- esac
- 
-@@ -2766,6 +2766,7 @@ config/autoconf.mk
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile 
- lib/ds/Makefile 
- lib/libc/Makefile 
diff --git a/dev-libs/nspr/nspr-4.6.4-r1.ebuild b/dev-libs/nspr/nspr-4.6.4-r2.ebuild
index b2db74537d5a..83046e755d76 100644
--- a/dev-libs/nspr/nspr-4.6.4-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.6.4-r2.ebuild
@@ -1,11 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.4-r1.ebuild,v 1.1 2007/01/05 21:43:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.4-r2.ebuild,v 1.1 2007/02/07 10:56:12 armin76 Exp $
 
-WANT_AUTOMAKE='latest'
-WANT_AUTOCONF='latest'
-
-inherit eutils autotools
+inherit eutils
 
 DESCRIPTION="Netscape Portable Runtime"
 HOMEPAGE="http://www.mozilla.org/projects/nspr/"
@@ -17,21 +14,19 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 IUSE="ipv6 debug"
 
 DEPEND=""
-S="${WORKDIR}/${P}/mozilla/nsprpub"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	EPATCH_OPTS="-p2" epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
-	EPATCH_OPTS="-p2" epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
-	epatch "${FILESDIR}"/${PN}-4.6.4-config-2.patch
-	EPATCH_OPTS="-p2" epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-	EPATCH_OPTS="-p2" epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch
-	eautoreconf
+	mkdir build inst
+	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch
 }
 
 src_compile() {
-	cd "${S}/build"
+	cd build
 
 	if use amd64 || use ppc64 || use ia64 || use s390; then
 		myconf="${myconf} --enable-64bit"
@@ -43,15 +38,9 @@ src_compile() {
 		myconf="${myconf} --enable-ipv6"
 	fi
 
-	../configure \
-		--build=${CBUILD:-${CHOST}} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir)/nspr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
+	ECONF_SOURCE="../mozilla/nsprpub" econf \
 		$(use_enable debug) \
-		${myconf} || die "./configure failed"
+		${myconf} || die "econf failed"
 	make || die
 }
 
diff --git a/dev-libs/nspr/nspr-4.6.5.ebuild b/dev-libs/nspr/nspr-4.6.5.ebuild
new file mode 100644
index 000000000000..4e7818caa739
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.6.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.5.ebuild,v 1.1 2007/02/07 10:56:12 armin76 Exp $
+
+inherit eutils
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 debug"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir build inst
+	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch
+}
+
+src_compile() {
+	cd build
+
+	if use amd64 || use ppc64 || use ia64 || use s390; then
+		myconf="${myconf} --enable-64bit"
+	else
+		myconf=""
+	fi
+
+	if use ipv6; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	ECONF_SOURCE="../mozilla/nsprpub" econf \
+		$(use_enable debug) \
+		${myconf} || die "econf failed"
+	make || die
+}
+
+src_install () {
+	# Their build system is royally fucked, as usual
+	MINOR_VERSION=6
+	cd ${S}/build
+	make install
+	insinto /usr
+	doins -r dist/*
+	rm -rf ${D}/usr/bin/lib*.so
+
+	#removing includes/nspr/md as per fedora spec
+	# i.e a waste of space!
+	rm -rf ${D}/usr/include/nspr/md
+
+	# there have been /usr/lib/nspr changes (like the ldpath below), but never
+	# have I seen any libraries end up in this directory. lets fix that.
+	# note: I tried doing this fix via the build system. It wont work.
+	if [ ! -e ${D}/usr/lib/nspr ] ; then
+		mkdir -p ${D}/usr/lib/nspr
+		mv ${D}/usr/lib/*so* ${D}/usr/lib/nspr
+		mv ${D}/usr/lib/*\.a ${D}/usr/lib/nspr
+	fi
+	# and while we're at it, lets make it actually use the arch's libdir damnit
+	if [ "lib" != "$(get_libdir)" ] ; then
+		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+	fi
+	#and while at it move them to files with versions-ending
+	#and link them back :)
+	cd ${D}/usr/$(get_libdir)/nspr
+	for file in *.so; do
+		mv ${file} ${file}.${MINOR_VERSION}
+		ln -s ${file}.${MINOR_VERSION} ${file}
+	done
+	# cope with libraries being in /usr/lib/nspr
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/08nspr
+
+	# install nspr-config
+	insinto	 /usr/bin
+	doins ${S}/build/config/nspr-config
+	chmod a+x ${D}/usr/bin/nspr-config
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins ${S}/build/config/nspr.pc
+}