Fix versioning (b is part of PV). Also fixed setXid QA notice for makeweb executable. Marked stable on x86.

Package-Manager: portage-2.0.51-r15

4 files changed, 36 insertions, 18 deletions

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index 09bd4a12e305..67e2dd75e691 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/thttpd
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.3 2004/09/08 13:16:23 rl03 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.4 2005/02/09 16:12:53 ka0ttic Exp $
+
+*thttpd-2.25b (09 Feb 2005)
+
+  09 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> -thttpd-2.25.ebuild,
+  +thttpd-2.25b.ebuild:
+  Fix versioning (b is part of PV). Also fixed setXid QA notice for makeweb
+  executable. Marked stable on x86.
 
   08 Sep 2004; Renat Lumpau <rl03@gentoo.org> metadata.xml:
   Fixed herd name
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index cb4c8aca1d86..f3b0775a9d53 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -1,7 +1,17 @@
-MD5 7e68523f421ec68168959ed7826e7e7e thttpd-2.25.ebuild 1180
-MD5 e6404d96f6c416527d95855e8b42b3f0 ChangeLog 1193
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 53f962724891d65e45ce4ab2257421eb ChangeLog 1432
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
-MD5 1e6cbba778f6846533ae1d69310e0c4e files/digest-thttpd-2.25 64
+MD5 01cfdda0a52d777aa2c814dcf4ba9d95 thttpd-2.25b.ebuild 1188
+MD5 1e6cbba778f6846533ae1d69310e0c4e files/digest-thttpd-2.25b 64
 MD5 84af2600ce2cfa9331871027accd00f5 files/thttpd-2.25/thttpd.confd 1152
 MD5 98bfd7ed90b6a438a940413d5e541c29 files/thttpd-2.25/thttpd.init 828
 MD5 1d3e759791468812bd3c6dd786428cac files/thttpd-2.25/thttpd.conf.sample 672
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCCjaOEZCkKN40op4RAi9dAJ9tN4EK5Q/azx7E7ZBspBNikvK9LQCgqvcx
+oAwQSL+klU6Lk47spxbDMzo=
+=QSNi
+-----END PGP SIGNATURE-----
diff --git a/www-servers/thttpd/files/digest-thttpd-2.25 b/www-servers/thttpd/files/digest-thttpd-2.25b
index 823600acb15d..823600acb15d 100644
--- a/www-servers/thttpd/files/digest-thttpd-2.25
+++ b/www-servers/thttpd/files/digest-thttpd-2.25b
diff --git a/www-servers/thttpd/thttpd-2.25.ebuild b/www-servers/thttpd/thttpd-2.25b.ebuild
index 3fcca598c47e..afe4a2dfe576 100644
--- a/www-servers/thttpd/thttpd-2.25.ebuild
+++ b/www-servers/thttpd/thttpd-2.25b.ebuild
@@ -1,22 +1,25 @@
-# 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/www-servers/thttpd/thttpd-2.25.ebuild,v 1.1 2004/08/08 18:34:03 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b.ebuild,v 1.1 2005/02/09 16:12:53 ka0ttic Exp $
 
-MY_P="${P}b"
+inherit 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/${MY_P}.tar.gz"
+SRC_URI="http://www.acme.com/software/thttpd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND="virtual/libc"
-S="${WORKDIR}/${MY_P}"
 
 src_compile() {
+	append-ldflags -Wl,-z,now
+
 	## TODO: what to do with IPv6?
 	econf || die
 #	if use ipv6; then
@@ -26,7 +29,7 @@ src_compile() {
 }
 
 src_install () {
-	mkdir -p ${D}/usr/share/man/man1
+	dodir /usr/share/man/man1
 	make prefix=${D}/usr \
 		MANDIR=${D}/usr/share/man \
 		WEBGROUP=nogroup \
@@ -36,15 +39,13 @@ src_install () {
 	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
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${P}/thttpd.init thttpd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/${P}/thttpd.confd thttpd
-	dodoc README
+	dodoc README INSTALL TODO
 
 	insinto /etc/thttpd
-	doins ${FILESDIR}/${P}/thttpd.conf.sample
+	doins ${FILESDIR}/${MY_P}/thttpd.conf.sample
 }
 
 pkg_postinst() {