Removing old versions. Using toolchain-funs eclass now where it works.

7 files changed, 37 insertions, 115 deletions

diff --git a/net-libs/libhttpd-persistent/ChangeLog b/net-libs/libhttpd-persistent/ChangeLog
index 468f126836e7..d7750bb392f8 100644
--- a/net-libs/libhttpd-persistent/ChangeLog
+++ b/net-libs/libhttpd-persistent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libhttpd-persistent
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libhttpd-persistent/ChangeLog,v 1.12 2004/09/22 17:50:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libhttpd-persistent/ChangeLog,v 1.13 2004/10/19 07:40:28 eradicator Exp $
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -libhttpd-persistent-1.3p-r6.ebuild, -libhttpd-persistent-1.3p-r7.ebuild:
+  Removing old versions.  Using toolchain-funs eclass now where it works.
 
   22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   libhttpd-persistent-1.3p-r8.ebuild:
diff --git a/net-libs/libhttpd-persistent/Manifest b/net-libs/libhttpd-persistent/Manifest
index e7cc594600d4..8e44f7890a2b 100644
--- a/net-libs/libhttpd-persistent/Manifest
+++ b/net-libs/libhttpd-persistent/Manifest
@@ -1,8 +1,14 @@
-MD5 02e89b0f99d99cc6a2284aa49ae1621b ChangeLog 2601
-MD5 cf721678e28743ea0fab7fed1afc8322 libhttpd-persistent-1.3p-r6.ebuild 1417
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 300378ac668a717f80d4d7794626ac73 ChangeLog 2809
 MD5 34371b0b6264e8222d4666bf5895f5f7 metadata.xml 432
-MD5 24b3afa017edda99b1016be28d5b07f2 libhttpd-persistent-1.3p-r7.ebuild 1423
-MD5 78264ec5e530663b659e27f2e328523f libhttpd-persistent-1.3p-r8.ebuild 1423
-MD5 3d54fde5d128291ea5a6ae6dd4f9d840 files/digest-libhttpd-persistent-1.3p-r6 64
-MD5 a43bd699e47de8bf6404b07890394b13 files/digest-libhttpd-persistent-1.3p-r7 64
+MD5 4d6f4092967658051c871ccf0e5d5d42 libhttpd-persistent-1.3p-r8.ebuild 2096
 MD5 d59fcbd11fe6a68bf60fcba57b403351 files/digest-libhttpd-persistent-1.3p-r8 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBdMT2ArHZZzCEUG0RAtMGAJ45R/vBMs6plv4Tpohf1kwDyOoYLgCeKsiH
+4E2TG3Q0nUFt3LXuoEfIXr0=
+=yvt6
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libhttpd-persistent/files/digest-libhttpd-persistent-1.3p-r6 b/net-libs/libhttpd-persistent/files/digest-libhttpd-persistent-1.3p-r6
deleted file mode 100644
index 989c55a28172..000000000000
--- a/net-libs/libhttpd-persistent/files/digest-libhttpd-persistent-1.3p-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97f464bbf08908db9cec9baa24f6159e libhttpd-1.3p-f.tgz 155140
diff --git a/net-libs/libhttpd-persistent/files/digest-libhttpd-persistent-1.3p-r7 b/net-libs/libhttpd-persistent/files/digest-libhttpd-persistent-1.3p-r7
deleted file mode 100644
index 301338254d7b..000000000000
--- a/net-libs/libhttpd-persistent/files/digest-libhttpd-persistent-1.3p-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f0b24a3808c4681e44f3a37383947d90 libhttpd-1.3p-g.tgz 155407
diff --git a/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r6.ebuild b/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r6.ebuild
deleted file mode 100644
index 2bff3be15763..000000000000
--- a/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r6.ebuild,v 1.10 2004/07/15 00:53:53 agriffis Exp $
-
-MY_P="libhttpd-1.3p-f"
-
-DESCRIPTION="libhttpd-persistent is a modified version of David Hughes' libhttpd."
-HOMEPAGE="http://www.deleet.de/projekte/daap/daapd/"
-SRC_URI="http://www.deleet.de/projekte/daap/daapd/${MY_P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE=""
-DEPEND=""
-
-S="${WORKDIR}/libhttpd-1.3-persistent-f"
-
-src_compile() {
-	econf || die
-
-	# Package provided compilation is FUBAR
-	cd ${S}/src
-
-	CFILES="protocol.c api.c version.c ip_acl.c select.c"
-	OFILES=${CFILES//.c/.o}
-
-	for FILE in ${CFILES}; do
-		echo g++ ${CFLAGS} -D_OS_UNIX -fPIC -c ${FILE}
-		g++ ${CFLAGS} -D_OS_UNIX -fPIC -c ${FILE} || die
-	done
-
-	echo "linking"
-	ar rc libhttpd-persistent.a ${OFILES} || die
-	ranlib libhttpd-persistent.a || die
-
-	g++ -shared -Wl,-shared,-soname,libhttpd-persistent.so \
-		${OFILES} -o libhttpd-persistent.so || die
-}
-
-src_install() {
-	# This pacakge doesn't respect anything autoconf-ish
-	dolib.a src/libhttpd-persistent.a
-	dolib.so src/libhttpd-persistent.so
-
-	mkdir -p ${D}/usr/include/
-	cp src/httpd-persistent.h ${D}/usr/include/
-	chmod 644 ${D}/usr/include/httpd-persistent.h
-
-	dodoc HISTORY License README doc/FAQ.txt doc/libhttpd.pdf
-}
diff --git a/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r7.ebuild b/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r7.ebuild
deleted file mode 100644
index ba1f889ce99c..000000000000
--- a/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r7.ebuild,v 1.3 2004/09/01 08:44:45 eradicator Exp $
-
-MY_P="libhttpd-1.3p-g"
-
-DESCRIPTION="libhttpd-persistent is a modified version of David Hughes' libhttpd."
-HOMEPAGE="http://www.deleet.de/projekte/daap/daapd/"
-SRC_URI="http://www.deleet.de/projekte/daap/daapd/${MY_P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc amd64 sparc"
-IUSE=""
-DEPEND=""
-
-S="${WORKDIR}/libhttpd-1.3-persistent-g"
-
-src_compile() {
-	econf || die
-
-	# Package provided compilation is FUBAR
-	cd ${S}/src
-
-	CFILES="protocol.c api.c version.c ip_acl.c select.c"
-	OFILES=${CFILES//.c/.o}
-
-	for FILE in ${CFILES}; do
-		echo g++ ${CFLAGS} -D_OS_UNIX -fPIC -c ${FILE}
-		g++ ${CFLAGS} -D_OS_UNIX -fPIC -c ${FILE} || die
-	done
-
-	echo "linking"
-	ar rc libhttpd-persistent.a ${OFILES} || die
-	ranlib libhttpd-persistent.a || die
-
-	g++ -shared -Wl,-shared,-soname,libhttpd-persistent.so \
-		${OFILES} -o libhttpd-persistent.so || die
-}
-
-src_install() {
-	# This pacakge doesn't respect anything autoconf-ish
-	dolib.a src/libhttpd-persistent.a
-	dolib.so src/libhttpd-persistent.so
-
-	mkdir -p ${D}/usr/include/
-	cp src/httpd-persistent.h ${D}/usr/include/
-	chmod 644 ${D}/usr/include/httpd-persistent.h
-
-	dodoc HISTORY License README doc/FAQ.txt doc/libhttpd.pdf
-}
diff --git a/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild b/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild
index 7bd5ec0e2636..f5d7ebd8709c 100644
--- a/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild
+++ b/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild
@@ -1,18 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild,v 1.2 2004/09/22 17:50:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild,v 1.3 2004/10/19 07:40:28 eradicator Exp $
 
 IUSE=""
 
+inherit toolchain-funcs
+
 MY_P="libhttpd-1.3p-h"
 S="${WORKDIR}/libhttpd-1.3-persistent-h"
 
 DESCRIPTION="libhttpd-persistent is a modified version of David Hughes' libhttpd."
 HOMEPAGE="http://www.deleet.de/projekte/daap/daapd/"
 SRC_URI="http://www.deleet.de/projekte/daap/daapd/${MY_P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc amd64 sparc"
+
 DEPEND=""
 
 src_compile() {
@@ -22,19 +26,29 @@ src_compile() {
 	cd ${S}/src
 
 	CFILES="protocol.c api.c version.c ip_acl.c select.c"
+	LOFILES=${CFILES//.c/.lo}
 	OFILES=${CFILES//.c/.o}
 
 	for FILE in ${CFILES}; do
-		echo g++ ${CFLAGS} -D_OS_UNIX -fPIC -c ${FILE}
-		g++ ${CFLAGS} -D_OS_UNIX -fPIC -c ${FILE} || die
+		echo $(tc-getCXX) ${CFLAGS} -D_OS_UNIX -c ${FILE} -o ${FILE//.c/.o}
+		$(tc-getCXX) ${CFLAGS} -D_OS_UNIX -c ${FILE} -o ${FILE//.c/.o} || die
+		echo $(tc-getCXX) ${CFLAGS} -D_OS_UNIX -fPIC -c ${FILE} -o ${FILE//.c/.lo}
+		$(tc-getCXX) ${CFLAGS} -D_OS_UNIX -fPIC -c ${FILE} -o ${FILE//.c/.lo} || die
 	done
 
-	echo "linking"
+#	echo $(tc-getAR) rc libhttpd-persistent.a ${OFILES} || die
+#	$(tc-getAR) rc libhttpd-persistent.a ${OFILES} || die
+#	echo $(tc-getRANLIB) libhttpd-persistent.a || die
+#	$(tc-getRANLIB) libhttpd-persistent.a || die
+	echo ar rc libhttpd-persistent.a ${OFILES} || die
 	ar rc libhttpd-persistent.a ${OFILES} || die
+	echo ranlib libhttpd-persistent.a || die
 	ranlib libhttpd-persistent.a || die
 
-	g++ -shared -Wl,-shared,-soname,libhttpd-persistent.so \
-		${OFILES} -o libhttpd-persistent.so || die
+	echo $(tc-getCXX) -shared -Wl,-shared,-soname,libhttpd-persistent.so \
+		${LOFILES} -o libhttpd-persistent.so || die
+	$(tc-getCXX) -shared -Wl,-shared,-soname,libhttpd-persistent.so \
+		${LOFILES} -o libhttpd-persistent.so || die
 }
 
 src_install() {