summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-text/xml2doc/ChangeLog9
-rw-r--r--app-text/xml2doc/Manifest14
-rw-r--r--app-text/xml2doc/xml2doc-20030510-r1.ebuild27
3 files changed, 34 insertions, 16 deletions
diff --git a/app-text/xml2doc/ChangeLog b/app-text/xml2doc/ChangeLog
index 0b32e1cdcae7..65502eb19d90 100644
--- a/app-text/xml2doc/ChangeLog
+++ b/app-text/xml2doc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/xml2doc
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xml2doc/ChangeLog,v 1.17 2007/03/14 20:17:41 leonardop Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xml2doc/ChangeLog,v 1.18 2009/06/02 10:05:48 flameeyes Exp $
+
+ 02 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+ xml2doc-20030510-r1.ebuild:
+ Cleanup ebuild and fix build with --as-needed, thanks to Kevin Pyle in bug
+ #247001.
*xml2doc-20030510-r1 (14 Mar 2007)
diff --git a/app-text/xml2doc/Manifest b/app-text/xml2doc/Manifest
index d428ad790cf2..0359e614a103 100644
--- a/app-text/xml2doc/Manifest
+++ b/app-text/xml2doc/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX xml2doc-pointer_fix.patch 627 RMD160 95efafd81d61837ebd9982c80c0159b13524bc55 SHA1 607cc1dc46be04fc06f5a0197ece5cc0ca0acf1c SHA256 e1274d3084bbe7821e23c1b64658a3df80253fdbcd4dde890a497dd08f813545
DIST xml2doc-20030510.tgz 53307 RMD160 d2f7d13ace6dc0a68a3ca4aec993ca78b18930e6 SHA1 2453ff5437c40974f8804fe5907e483792ae6d2a SHA256 dd675754a856f5ca40dfd12e0264ea51228c3d795f853d2310677fd25ea7866e
-EBUILD xml2doc-20030510-r1.ebuild 1265 RMD160 f2187fd4fe08c43db8987e30fb755952e600ee73 SHA1 fb15eeeda15f088fe675cee58b73436e866b6ea7 SHA256 9d8a7bfa1f64497dc625d81ed34185a77b6734e9f5ca41b7acdbbbe5f831135a
+EBUILD xml2doc-20030510-r1.ebuild 1401 RMD160 023ab9703c59c36033bab90b71774313f3aed1ff SHA1 a1638ccdf0d3a0ccb0f98252f24001b675eee21a SHA256 4269f99a2bc3a3f6f0ae5a2488d9338548941fdac4b73aae16dba5df97c4805f
EBUILD xml2doc-20030510.ebuild 992 RMD160 cd77c576a37be009fede03ea673710fcfc8b654a SHA1 ce60f5ea4c005f0c11f278d00418d4522ff392be SHA256 ac9b744a1ed3eb459a7fb70eb6fd939825e4e655613f1cebd4f3d0a7ae543900
-MISC ChangeLog 1953 RMD160 47ee8ede027d6fb79fc6f646d606226cda1fd7b6 SHA1 289a1726ebc11ee78b1717f87182fce5214727ff SHA256 848e28abd8c3c18f0505eb3d747c20b471ceb69fb0af669b184456744fabb759
+MISC ChangeLog 2128 RMD160 92d7bfe1bdfde9ae98b746f008848a25e9a1b1a4 SHA1 be931e48dd8fcfbd09f7cf784788bea98be21645 SHA256 9ea1531333e761d7f5fd5ffff04a3cb6b96deedd6f28eba1360de1f1834b8c20
MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkok+YEACgkQAiZjviIA2XhUCQCeLUIKDKgs8tstVHzIxRjRogTQ
+5ccAoMHkFdmEAHulXxkTlqIIKwNkN3qD
+=f39E
+-----END PGP SIGNATURE-----
diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
index 94ec1193fb4a..fc18e6521b17 100644
--- a/app-text/xml2doc/xml2doc-20030510-r1.ebuild
+++ b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xml2doc/xml2doc-20030510-r1.ebuild,v 1.2 2007/07/12 04:37:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xml2doc/xml2doc-20030510-r1.ebuild,v 1.3 2009/06/02 10:05:48 flameeyes Exp $
inherit eutils
@@ -28,29 +28,32 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-pointer_fix.patch"
# Don't strip symbols from binary (bug #152266)
- sed -i -e '/^\s*strip/d' src/Makefile.in
+ sed -i -e '/^\s*strip/d' \
+ -e '/^CC=/d' \
+ -e 's/^\t$(CC) $(LFLAGS).*/\t$(LINK.o) $(L_PDF) $^ -lxml2 -o $(BIN)/' \
+ -e '/^\t$(CC) $(CFLAGS) /d' \
+ src/Makefile.in
}
src_compile() {
- local myconf="$(use_enable pdf)"
-
- econf $myconf || die "./configure failed"
+ econf $(use_enable pdf) || die "./configure failed"
emake || die "Compilation failed"
+
+ cd "${S}/doc"
+ "${S}"/src/xml2doc -oM manpage.xml xml2doc.1 || die
}
src_install() {
# xml2doc's make install is unfortunately broken
# binary
- dobin ${S}/src/xml2doc
+ dobin src/xml2doc || die
# documentation
- dodoc BUGS README TODO
+ dodoc BUGS README TODO || die
docinto examples
- dodoc ${S}/examples/*.{xml,png}
+ dodoc examples/*.{xml,png} || die
# manpage
- cd ${S}/doc
- ${S}/src/xml2doc -oM manpage.xml xml2doc.1
- doman xml2doc.1
+ doman doc/xml2doc.1 || die
}