Avoid pre-stripping binaries (bug #152266). Added patch to fix pointer-related bug.

Package-Manager: portage-2.1.2.2

diff --git a/app-text/xml2doc/ChangeLog b/app-text/xml2doc/ChangeLog
index 2860115b8497b4b21226d31b083c8e47c183b82d..0b32e1cdcae7188e9281aff7c2a76bb87ddbb6d7 100644 (file)
--- a/app-text/xml2doc/ChangeLog
+++ b/app-text/xml2doc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.16 2007/03/13 00:29:42 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xml2doc/ChangeLog,v 1.17 2007/03/14 20:17:41 leonardop Exp $
+
+*xml2doc-20030510-r1 (14 Mar 2007)
+
+  14 Mar 2007; Leonardo Boshell <leonardop@gentoo.org>
+  +files/xml2doc-pointer_fix.patch, +xml2doc-20030510-r1.ebuild:
+  Avoid pre-stripping binaries (bug #152266). Added patch to fix a
+  pointer-related bug detected thanks to another QA notice.
 
   13 Mar 2007; Leonardo Boshell <leonardop@gentoo.org> metadata.xml:
   Replacing text-markup herd with the new sgml herd.

diff --git a/app-text/xml2doc/Manifest b/app-text/xml2doc/Manifest
index c873f9417bc6a09cf7c82cd25f96623a6907ec91..a2f6e75d2e23ba5b9498b396cf1681515e554514 100644 (file)
--- a/app-text/xml2doc/Manifest
+++ b/app-text/xml2doc/Manifest
@@ -1,12 +1,20 @@
+AUX xml2doc-pointer_fix.patch 627 RMD160 95efafd81d61837ebd9982c80c0159b13524bc55 SHA1 607cc1dc46be04fc06f5a0197ece5cc0ca0acf1c SHA256 e1274d3084bbe7821e23c1b64658a3df80253fdbcd4dde890a497dd08f813545
+MD5 970ed285565fbd04e09ccedce0eb2402 files/xml2doc-pointer_fix.patch 627
+RMD160 95efafd81d61837ebd9982c80c0159b13524bc55 files/xml2doc-pointer_fix.patch 627
+SHA256 e1274d3084bbe7821e23c1b64658a3df80253fdbcd4dde890a497dd08f813545 files/xml2doc-pointer_fix.patch 627
 DIST xml2doc-20030510.tgz 53307 RMD160 d2f7d13ace6dc0a68a3ca4aec993ca78b18930e6 SHA1 2453ff5437c40974f8804fe5907e483792ae6d2a SHA256 dd675754a856f5ca40dfd12e0264ea51228c3d795f853d2310677fd25ea7866e
+EBUILD xml2doc-20030510-r1.ebuild 1266 RMD160 1177da79474c5fbdfe1a3df94fb0d217a9c1e4de SHA1 2f39abd7bb5166a4ca9f7f1321816bcdb964a39b SHA256 a31423062b0c770b859bcdade11528eec98d531dba86402e72d215867eeb7c71
+MD5 8cf5e87ea989db6648610c3141fa3e7f xml2doc-20030510-r1.ebuild 1266
+RMD160 1177da79474c5fbdfe1a3df94fb0d217a9c1e4de xml2doc-20030510-r1.ebuild 1266
+SHA256 a31423062b0c770b859bcdade11528eec98d531dba86402e72d215867eeb7c71 xml2doc-20030510-r1.ebuild 1266
 EBUILD xml2doc-20030510.ebuild 992 RMD160 cd77c576a37be009fede03ea673710fcfc8b654a SHA1 ce60f5ea4c005f0c11f278d00418d4522ff392be SHA256 ac9b744a1ed3eb459a7fb70eb6fd939825e4e655613f1cebd4f3d0a7ae543900
 MD5 1c6e2439b26ea5e5ed99776001105f64 xml2doc-20030510.ebuild 992
 RMD160 cd77c576a37be009fede03ea673710fcfc8b654a xml2doc-20030510.ebuild 992
 SHA256 ac9b744a1ed3eb459a7fb70eb6fd939825e4e655613f1cebd4f3d0a7ae543900 xml2doc-20030510.ebuild 992
-MISC ChangeLog 1669 RMD160 6a2c757acc9cbf7046bfe9428660d107660f3948 SHA1 b346cf70abef0092d12345bc36437b664cc12e6f SHA256 25146732b87fb30c98aa2ae1b936f3239a3d4cf195207d119689174ce770e705
-MD5 60949f6ac25afab417d95ac91a2de6a8 ChangeLog 1669
-RMD160 6a2c757acc9cbf7046bfe9428660d107660f3948 ChangeLog 1669
-SHA256 25146732b87fb30c98aa2ae1b936f3239a3d4cf195207d119689174ce770e705 ChangeLog 1669
+MISC ChangeLog 1953 RMD160 47ee8ede027d6fb79fc6f646d606226cda1fd7b6 SHA1 289a1726ebc11ee78b1717f87182fce5214727ff SHA256 848e28abd8c3c18f0505eb3d747c20b471ceb69fb0af669b184456744fabb759
+MD5 2d1d951919d567238c403f9f50da052c ChangeLog 1953
+RMD160 47ee8ede027d6fb79fc6f646d606226cda1fd7b6 ChangeLog 1953
+SHA256 848e28abd8c3c18f0505eb3d747c20b471ceb69fb0af669b184456744fabb759 ChangeLog 1953
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
 MD5 f6f50979d39d8d194c09b8f7833219aa metadata.xml 159
 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 metadata.xml 159
@@ -14,3 +22,6 @@ SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3 metadata
 MD5 841d27864876a028211c57180e1db36f files/digest-xml2doc-20030510 238
 RMD160 1a974ac5928dced9bf7b6dfee11375d01d2af1bf files/digest-xml2doc-20030510 238
 SHA256 e20355195d8a1237df3bfa1425548ddb3b68a8199790b08da7a02c1c65d0eb00 files/digest-xml2doc-20030510 238
+MD5 841d27864876a028211c57180e1db36f files/digest-xml2doc-20030510-r1 238
+RMD160 1a974ac5928dced9bf7b6dfee11375d01d2af1bf files/digest-xml2doc-20030510-r1 238
+SHA256 e20355195d8a1237df3bfa1425548ddb3b68a8199790b08da7a02c1c65d0eb00 files/digest-xml2doc-20030510-r1 238

diff --git a/app-text/xml2doc/files/digest-xml2doc-20030510-r1 b/app-text/xml2doc/files/digest-xml2doc-20030510-r1
new file mode 100644 (file)
index 0000000..526f6d8
--- /dev/null
+++ b/app-text/xml2doc/files/digest-xml2doc-20030510-r1
@@ -0,0 +1,3 @@
+MD5 5cadf5d0c3ff8d9b150f332861c33f7e xml2doc-20030510.tgz 53307
+RMD160 d2f7d13ace6dc0a68a3ca4aec993ca78b18930e6 xml2doc-20030510.tgz 53307
+SHA256 dd675754a856f5ca40dfd12e0264ea51228c3d795f853d2310677fd25ea7866e xml2doc-20030510.tgz 53307

diff --git a/app-text/xml2doc/files/xml2doc-pointer_fix.patch b/app-text/xml2doc/files/xml2doc-pointer_fix.patch
new file mode 100644 (file)
index 0000000..b6adabe
--- /dev/null
+++ b/app-text/xml2doc/files/xml2doc-pointer_fix.patch
@@ -0,0 +1,20 @@
+diff -NurdpB xml2doc/src/output_info.c xml2doc-patched/src/output_info.c
+--- xml2doc/src/output_info.c  2003-04-25 05:11:27.000000000 -0500
++++ xml2doc-patched/src/output_info.c  2007-03-14 15:07:59.000000000 -0500
+@@ -9,11 +9,11 @@ void output_info()
+               *subject  =  xmlGetProp(Doc[n].cur,"subject"),
+               *keywords =  xmlGetProp(Doc[n].cur,"keywords"),
+               *trapped  =  xmlGetProp(Doc[n].cur,"trapped");
+-      struct time_t *timet;
+-        struct tm *clk;
+-      
+-      time((time_t *)&timet);         
+-      clk=localtime((const time_t *)&timet);
++      time_t timet;
++      struct tm *clk;
++
++      time(&timet);
++      clk=localtime(&timet);
+ 
+       switch(DocS.output)
+       {

diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
new file mode 100644 (file)
index 0000000..d221c6c
--- /dev/null
+++ b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2007 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.1 2007/03/14 20:17:41 leonardop Exp $
+
+inherit eutils
+
+DESCRIPTION="Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)"
+
+HOMEPAGE="http://xml2doc.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+IUSE="pdf"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-libs/libxml2-2.5
+       pdf? ( >=media-libs/pdflib-4 )"
+
+S=${WORKDIR}/${PN}
+
+
+src_unpack() {
+       unpack "${A}"
+       cd "${S}"
+
+       # Fix pointer-related bug detected by a QA notice.
+       epatch "${FILESDIR}/${PN}-pointer_fix.patch"
+
+       # Don't strip symbols from binary (bug #152266)
+       sed -i -e '/^\s*strip/d' src/Makefile.in
+}
+
+src_compile() {
+       local myconf="$(use_enable pdf)"
+
+       econf $myconf || die "./configure failed"
+       emake || die "Compilation failed"
+}
+
+src_install() {
+       # xml2doc's make install is unfortunately broken
+
+       # binary
+       dobin ${S}/src/xml2doc
+
+       # documentation
+       dodoc BUGS README TODO
+       docinto examples
+       dodoc ${S}/examples/*.{xml,png}
+
+       # manpage
+       cd ${S}/doc
+       ${S}/src/xml2doc -oM manpage.xml xml2doc.1
+       doman xml2doc.1
+}