Fixing #153651 (thanks to Tobias Scherbaum for reporting it), cleaning up the ebuild.

Package-Manager: portage-2.1.2_rc1-r3

diff --git a/dev-libs/fcgi/ChangeLog b/dev-libs/fcgi/ChangeLog
index 31f3f735e4935a6c28f4f18d2d58fc84f5de6834..6ff283a511be6ba4e90a8ff456c08bce9bad0d33 100644 (file)
--- a/dev-libs/fcgi/ChangeLog
+++ b/dev-libs/fcgi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/fcgi
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/ChangeLog,v 1.22 2006/10/21 21:33:53 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/ChangeLog,v 1.23 2006/11/04 17:21:45 phreak Exp $
+
+  04 Nov 2006; Christian Heim <phreak@gentoo.org> fcgi-2.4.0-r1.ebuild:
+  Fixing #153651 (thanks to Tobias Scherbaum for reporting it), cleaning up
+  the ebuild.
 
   21 Oct 2006; Thomas Cort <tcort@gentoo.org> fcgi-2.4.0-r1.ebuild:
   Stable on alpha.

diff --git a/dev-libs/fcgi/Manifest b/dev-libs/fcgi/Manifest
index 3c370d2183224b41c1b9a9f9c72393227655110c..765944c78b0b75d30eb347b71ccf328239fda547 100644 (file)
--- a/dev-libs/fcgi/Manifest
+++ b/dev-libs/fcgi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fcgi-2.4.0-Makefile.patch 846 RMD160 dc3beead1d6431eca49e9635a05b4b62cfbf0cd9 SHA1 80dee3eb6f4b2b461083bc9607ac4d64bbbe1a5d SHA256 3d01cc53a4eb63d416ee6cdcd29e099d759947ae200c4062fcc3cfd823849f62
 MD5 d6a5c4fe2899fbcb564dca4feeee1f9f files/fcgi-2.4.0-Makefile.patch 846
 RMD160 dc3beead1d6431eca49e9635a05b4b62cfbf0cd9 files/fcgi-2.4.0-Makefile.patch 846
@@ -7,18 +10,18 @@ MD5 d2654525f06451c99b8cdd4cc00a963b files/fcgi-2.4.0-clientdata-pointer.patch 3
 RMD160 fb6e7341cd162640665c4c2b65784bff0889e1f1 files/fcgi-2.4.0-clientdata-pointer.patch 3203
 SHA256 27936406b5fcb13096bbdd80ee7eb0cf262e5c2b983e79e41d17a3cd17387683 files/fcgi-2.4.0-clientdata-pointer.patch 3203
 DIST fcgi-2.4.0.tar.gz 468682 RMD160 df5c01b197bc72fca7abee184a34ec14253dd0f0 SHA1 2329404159e8b8315e524b9eaf1de763202c6e6a SHA256 66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9
-EBUILD fcgi-2.4.0-r1.ebuild 861 RMD160 5bba7e9fd36a4bebb9f89a9cf36644143cd05a3d SHA1 88f28a6dcc7000e5be9533c2d08fe6264afdc662 SHA256 5b11b67dde42fe2f35539c48de878678877559f78aadd8b0ff09fd874b0723b9
-MD5 f4dca45573c88d62be636b8403e4e098 fcgi-2.4.0-r1.ebuild 861
-RMD160 5bba7e9fd36a4bebb9f89a9cf36644143cd05a3d fcgi-2.4.0-r1.ebuild 861
-SHA256 5b11b67dde42fe2f35539c48de878678877559f78aadd8b0ff09fd874b0723b9 fcgi-2.4.0-r1.ebuild 861
+EBUILD fcgi-2.4.0-r1.ebuild 1080 RMD160 c838f7f9b52203acf0a0685859298b6101b98770 SHA1 6812c286d92e2007c87faf0f831b5ddb7d8dd218 SHA256 71b102a7b01617e83132c014c3ef0853f2e3c4e3312226d11738b8a90a1a7162
+MD5 923f5e37c310e4ba48f8ca7ef8101605 fcgi-2.4.0-r1.ebuild 1080
+RMD160 c838f7f9b52203acf0a0685859298b6101b98770 fcgi-2.4.0-r1.ebuild 1080
+SHA256 71b102a7b01617e83132c014c3ef0853f2e3c4e3312226d11738b8a90a1a7162 fcgi-2.4.0-r1.ebuild 1080
 EBUILD fcgi-2.4.0.ebuild 812 RMD160 1e7386cd66cb1ca0831f7fdaa2c8f42a080ea112 SHA1 837dad4c3a8f035bed913a6ee5fa962a0c7466da SHA256 63a8c81385bf80591e4e74800a1cc3fb1cb04ad49c897486a781bc90c80035fc
 MD5 c7dcf8850edfdd65f7800b3d1c12af56 fcgi-2.4.0.ebuild 812
 RMD160 1e7386cd66cb1ca0831f7fdaa2c8f42a080ea112 fcgi-2.4.0.ebuild 812
 SHA256 63a8c81385bf80591e4e74800a1cc3fb1cb04ad49c897486a781bc90c80035fc fcgi-2.4.0.ebuild 812
-MISC ChangeLog 2500 RMD160 13e1ddcd711a130012f72559657116d11ab7e6d4 SHA1 c836d7d3f974dd6a3e9136ba16ecf765eed90f8b SHA256 97b1013f83582e0f872a0f63df63b5c756bd71ada6a9950750e830b2eb3b00b7
-MD5 caa523458de530c2de26a076b45f13c3 ChangeLog 2500
-RMD160 13e1ddcd711a130012f72559657116d11ab7e6d4 ChangeLog 2500
-SHA256 97b1013f83582e0f872a0f63df63b5c756bd71ada6a9950750e830b2eb3b00b7 ChangeLog 2500
+MISC ChangeLog 2664 RMD160 51305d4db1e9951775a60eac5598c9b78a38376a SHA1 aff2b1da78ec0a87c8725d212cf0a360fcfc726a SHA256 0f04b84577bc188ff90d1090f1b33751420dda53ff27ee904ae68ac899c514ea
+MD5 2fad4c5ed638ceb0522754ebb951de40 ChangeLog 2664
+RMD160 51305d4db1e9951775a60eac5598c9b78a38376a ChangeLog 2664
+SHA256 0f04b84577bc188ff90d1090f1b33751420dda53ff27ee904ae68ac899c514ea ChangeLog 2664
 MISC metadata.xml 233 RMD160 11bb0852d206051fed6e23c210fdcd2ee2cdbad5 SHA1 58f27fdf3ed652085e12776fc3c6302b50da5119 SHA256 05454ef42a9bf27fd9f98807e292bbb7a5bc1d3163d91f95bd4ec1f4ec7df69b
 MD5 a2fa038f003aeb0aea65f845a7c332dc metadata.xml 233
 RMD160 11bb0852d206051fed6e23c210fdcd2ee2cdbad5 metadata.xml 233
@@ -29,3 +32,10 @@ SHA256 3798424d8c4985dbc3becf55352ae00fbd239f633c36910c90a5fb3853c85a70 files/di
 MD5 14b9f075aa8a46f6b93d7baee240544d files/digest-fcgi-2.4.0-r1 232
 RMD160 f40f8e4021c8dbf2e291d3dee9b857e1685b26c2 files/digest-fcgi-2.4.0-r1 232
 SHA256 3798424d8c4985dbc3becf55352ae00fbd239f633c36910c90a5fb3853c85a70 files/digest-fcgi-2.4.0-r1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFTMw3yuNVb5qfaOYRAgu8AJ9rpZs3P4foUPKYltUuZhzf09N7hwCeP+aW
+3fpg+xFX40J0yKA5tcO7PwA=
+=mQ/N
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/fcgi/fcgi-2.4.0-r1.ebuild b/dev-libs/fcgi/fcgi-2.4.0-r1.ebuild
index 12cf04584038fef5b7327cc6aa29af8cbd594768..d5b5d971f7143c19649b57b6b9cb61880746dbe6 100644 (file)
--- a/dev-libs/fcgi/fcgi-2.4.0-r1.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.0-r1.ebuild
@@ -1,33 +1,46 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/fcgi-2.4.0-r1.ebuild,v 1.3 2006/10/21 21:33:53 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/fcgi-2.4.0-r1.ebuild,v 1.4 2006/11/04 17:21:45 phreak Exp $
 
-inherit autotools
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit autotools eutils
 
 DESCRIPTION="FastCGI Developer's Kit"
 HOMEPAGE="http://www.fastcgi.com/"
 SRC_URI="http://www.fastcgi.com/dist/${P}.tar.gz"
+
 LICENSE="FastCGI"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="html"
 
-DEPEND="virtual/libc"
+DEPEND=""
+RDEPEND=""
 
 src_unpack() {
        unpack ${A}
+
        cd "${S}"
-       epatch "${FILESDIR}"/${P}-*.patch
+       epatch "${FILESDIR}/fcgi-2.4.0-Makefile.patch"
+       epatch "${FILESDIR}/fcgi-2.4.0-clientdata-pointer.patch"
+
        eautoreconf
 }
 
 src_install() {
        make DESTDIR="${D}" install LIBRARY_PATH="${D}"/usr/lib || die
+
        dodoc LICENSE.TERMS README
-       mv doc/*.[13] . && doman *.[13]
-       dohtml doc/*
-       insinto /usr/share/doc/${P}/examples
+
+       # install the manpages into the right place
+       doman doc/*.[13]
+
+       # Only install the html documentation if USE=html
+       use html && dohtml doc/*/*
+
+       # install examples in the right place
+       insinto /usr/share/doc/${PF}/examples
        doins examples/*.c
-       insinto /usr/share/doc/${P}/images
-       doins images/*
 }