remove bindnow-flags (bug #227029) - remove ancient version - fix quoting

Package-Manager: portage-2.1.4.4

4 files changed, 20 insertions, 74 deletions

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index 219aa1bb138e..e2c79a010ea3 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/thttpd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.28 2008/01/30 23:27:53 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.29 2008/06/26 08:39:18 bangert Exp $
+
+  26 Jun 2008; Thilo Bangert <bangert@gentoo.org> -thttpd-2.25b-r6.ebuild,
+  thttpd-2.25b-r7.ebuild:
+  remove bindnow-flags - as per bug #227029 - remove ancient version - fix
+  quoting
 
   30 Jan 2008; Thilo Bangert <bangert@gentoo.org> -thttpd-2.25b-r5.ebuild:
   remove vulnerable version - bug #159941
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index daea94ab3887..59d4982d3e60 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -6,7 +6,6 @@ AUX thttpd-2.25/thttpd.confd 1152 RMD160 78503da6afa0bae20ecace503a3f5f8b7532c4e
 AUX thttpd-2.25/thttpd.init 745 RMD160 cb2eda2714728f8cee568b83013f3b5bb70974e7 SHA1 83fdd54a3ac959dc5c6a066a181a41c1d898ed9c SHA256 5e4512079ef620a442833a3ff05c0c4ac2856c6c65cc13da8191bd67d0b1b5da
 AUX thttpd.logrotate 197 RMD160 28c782571b226e49680a80bcbe5313ccc2a92d5c SHA1 384127ca1725a08fcfcd08de46a200c53966c24e SHA256 0399d9fdc31a5555307d33c4744b21271e9d7d4d6ded78573fb9b2210f593bc6
 DIST thttpd-2.25b.tar.gz 132363 RMD160 15020e8d04d27b30c4da3104387a281e35d58025 SHA1 51bc25ef035d7557c869a02ce353580a1cadfa2c SHA256 4ceaa30ef55702d5cfdffdccd3a2dee8d3090e852c18c7ce8d17d692ad0bf024
-EBUILD thttpd-2.25b-r6.ebuild 1333 RMD160 bff7c122dd14c1db2a788517748dedf120d92b21 SHA1 45abefcbe561cc92c5763d31ca1e4696f98c0102 SHA256 2a34ce0baa6c8a29db21c5f208eb7d4356f9c85731f91fb08a7fe616953704af
-EBUILD thttpd-2.25b-r7.ebuild 1545 RMD160 1de6c04d1928999a938c4506e8e0720d9b60869c SHA1 3d30034b745797060087fd443108a37e68adec0b SHA256 dcfecd0cd193725a64f4ee465c46a58eda809dd566c8f3e18a212da7fdf1166d
-MISC ChangeLog 5411 RMD160 16c6f045f5b165fca16fe363f901f624c26ccc06 SHA1 c491f8d34e41dd04731d8d089a9d8bceb041ef60 SHA256 1fd4de4aaaa028dce324b7a5f715c7f9c8f6c6f755bbd9f452556dbe22fd1847
+EBUILD thttpd-2.25b-r7.ebuild 1532 RMD160 216255d159dc0c6de55ec0ee5aa96ca87030e649 SHA1 796cc29696ed7dca741e1c2a5357da76d960d5a9 SHA256 f20d9abe06a69763978388843959eeef9f2f05445ad179c6adffe7989f31f039
+MISC ChangeLog 5598 RMD160 9c34621911649df75059c7ab94dee80fd646b4bc SHA1 1b3c34573899134a9de5b61e4f009146152eb199 SHA256 008e23f6c1379f98b050a78374511b99fa093816a607cba61a7cfac375d7477a
 MISC metadata.xml 165 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 SHA1 f13cc4199505863990c257fe060882a5f9a32aab SHA256 f8fe79331ed918344f1ff85578f9a39c0c0925017f3f7de12619e4917acf577c
diff --git a/www-servers/thttpd/thttpd-2.25b-r6.ebuild b/www-servers/thttpd/thttpd-2.25b-r6.ebuild
deleted file mode 100644
index a70c868b2125..000000000000
--- a/www-servers/thttpd/thttpd-2.25b-r6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r6.ebuild,v 1.6 2007/03/12 17:26:21 gustavoz Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P%[a-z]*}"
-
-DESCRIPTION="Small and fast multiplexing webserver."
-HOMEPAGE="http://www.acme.com/software/thttpd/"
-SRC_URI="http://www.acme.com/software/thttpd/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ppc sparc x86 ~x86-fbsd"
-IUSE="static"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${MY_P}/*.diff
-}
-
-src_compile() {
-	## TODO: what to do with IPv6?
-
-	append-ldflags $(bindnow-flags)
-	use static && append-ldflags -static
-
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	dodir /usr/share/man/man1
-	make prefix=${D}/usr \
-		MANDIR=${D}/usr/share/man \
-		WEBGROUP=nogroup \
-		WEBDIR=${D}/var/www/localhost \
-		"$@" install || die "make install failed"
-
-	mv ${D}/usr/sbin/{,th_}htpasswd
-	mv ${D}/usr/share/man/man1/{,th_}htpasswd.1
-
-	newinitd ${FILESDIR}/${MY_P}/thttpd.init thttpd
-	newconfd ${FILESDIR}/${MY_P}/thttpd.confd thttpd
-
-	dodoc README INSTALL TODO
-
-	insinto /etc/thttpd
-	doins ${FILESDIR}/${MY_P}/thttpd.conf.sample
-}
-
-pkg_postinst() {
-	einfo "Adjust THTTPD_DOCROOT in /etc/conf.d/thttpd !"
-}
diff --git a/www-servers/thttpd/thttpd-2.25b-r7.ebuild b/www-servers/thttpd/thttpd-2.25b-r7.ebuild
index 6ebbdfdead59..9dbf6f7721a1 100644
--- a/www-servers/thttpd/thttpd-2.25b-r7.ebuild
+++ b/www-servers/thttpd/thttpd-2.25b-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r7.ebuild,v 1.5 2007/10/01 17:53:45 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r7.ebuild,v 1.6 2008/06/26 08:39:18 bangert Exp $
 
 inherit eutils flag-o-matic
 
@@ -20,8 +20,8 @@ THTTPD_GROUP=thttpd
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${MY_P}/*.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${MY_P}/*.diff
 }
 
 pkg_setup() {
@@ -31,8 +31,6 @@ pkg_setup() {
 
 src_compile() {
 	## TODO: what to do with IPv6?
-
-	append-ldflags $(bindnow-flags)
 	use static && append-ldflags -static
 
 	econf || die "econf failed"
@@ -41,17 +39,17 @@ src_compile() {
 
 src_install () {
 	dodir /usr/share/man/man1
-	make prefix=${D}/usr \
-		MANDIR=${D}/usr/share/man \
+	make prefix="${D}"/usr \
+		MANDIR="${D}"/usr/share/man \
 		WEBGROUP=${THTTPD_GROUP} \
-		WEBDIR=${D}/var/www/localhost \
+		WEBDIR="${D}"/var/www/localhost \
 		"$@" install || die "make install failed"
 
-	mv ${D}/usr/sbin/{,th_}htpasswd
-	mv ${D}/usr/share/man/man1/{,th_}htpasswd.1
+	mv "${D}"/usr/sbin/{,th_}htpasswd
+	mv "${D}"/usr/share/man/man1/{,th_}htpasswd.1
 
-	newinitd ${FILESDIR}/${MY_P}/thttpd.init thttpd
-	newconfd ${FILESDIR}/${MY_P}/thttpd.confd thttpd
+	newinitd "${FILESDIR}"/${MY_P}/thttpd.init thttpd
+	newconfd "${FILESDIR}"/${MY_P}/thttpd.confd thttpd
 
 	dodoc README INSTALL TODO
 
@@ -59,7 +57,7 @@ src_install () {
 	newins "${FILESDIR}/thttpd.logrotate" thttpd
 
 	insinto /etc/thttpd
-	doins ${FILESDIR}/${MY_P}/thttpd.conf.sample
+	doins "${FILESDIR}"/${MY_P}/thttpd.conf.sample
 }
 
 pkg_postinst() {