fix location of xpdfrc bug #65728; stable on amd64; cleanups

Package-Manager: portage-2.0.51.19

10 files changed, 25 insertions, 105 deletions

diff --git a/app-text/pdftohtml/ChangeLog b/app-text/pdftohtml/ChangeLog
index cfc7c63b6720..74ed805406be 100644
--- a/app-text/pdftohtml/ChangeLog
+++ b/app-text/pdftohtml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/pdftohtml
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/ChangeLog,v 1.23 2005/02/09 14:17:28 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/ChangeLog,v 1.24 2005/03/16 12:48:44 lanius Exp $
+
+  16 Mar 2005; Heinrich Wendel <lanius@gentoo.org> +metadata.xml,
+  -pdftohtml-0.36-r1.ebuild, -pdftohtml-0.36-r2.ebuild,
+  pdftohtml-0.36-r3.ebuild, -pdftohtml-0.36.ebuild:
+  fix location of xpdfrc bug #65728; stable on amd64; cleanups
 
   09 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   pdftohtml-0.36-r3.ebuild:
diff --git a/app-text/pdftohtml/Manifest b/app-text/pdftohtml/Manifest
index 9da083c5cf66..ea929d0e67fc 100644
--- a/app-text/pdftohtml/Manifest
+++ b/app-text/pdftohtml/Manifest
@@ -1,24 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 149518ec218bedb1e494e4f354bbe0de ChangeLog 2841
-MD5 413c368de17d0a51407be5454410a84f pdftohtml-0.36.ebuild 660
-MD5 e54cb74355ada1244a283d2ed18012d8 pdftohtml-0.36-r1.ebuild 931
-MD5 02c65dc1012a664dacfb2f8c0d4bc9d6 pdftohtml-0.36-r2.ebuild 1025
-MD5 4e7178b24ce788d633bb416877e842a6 pdftohtml-0.36-r3.ebuild 1107
-MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36 66
-MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r1 66
-MD5 87d20c86d1451638e4b7adc2f7ac8067 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
-MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
+MD5 933bc6788453b1e3448c72b2d39939cb pdftohtml-0.36-r3.ebuild 1186
+MD5 ab6878f00e8c1114a6af5c1be2b8e863 ChangeLog 3077
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
-MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r2 66
+MD5 c32a612ce419b9930ff273cf382558bf files/xpdf-3.00pl3-keylength.patch 346
 MD5 5d40ba9d885af84bcc917ad17e2bf8e0 files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch 1136
+MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
 MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r3 66
-MD5 c32a612ce419b9930ff273cf382558bf files/xpdf-3.00pl3-keylength.patch 346
+MD5 87d20c86d1451638e4b7adc2f7ac8067 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCCht/KRy60XGEcJIRArTkAKCn/P0AMqKDJWKU2ORrC71SFdErqQCfSTRj
-xE1iWkLYZx2OeFN9Mmw52iI=
-=wU7A
+iD8DBQFCOCtRevY57Fted3ERAsMeAKDeHwuqfqh1U8unxTK3CHdtO8FZlACg3FhF
+ZV4Da/J0aJ5cTbN4Rd/LoZo=
+=D3ys
 -----END PGP SIGNATURE-----
diff --git a/app-text/pdftohtml/files/digest-pdftohtml-0.36 b/app-text/pdftohtml/files/digest-pdftohtml-0.36
deleted file mode 100644
index 5ae8348e609f..000000000000
--- a/app-text/pdftohtml/files/digest-pdftohtml-0.36
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75ad095bb51e1f66c9f7691e6af12f44 pdftohtml-0.36.tar.gz 300922
diff --git a/app-text/pdftohtml/files/digest-pdftohtml-0.36-r1 b/app-text/pdftohtml/files/digest-pdftohtml-0.36-r1
deleted file mode 100644
index 5ae8348e609f..000000000000
--- a/app-text/pdftohtml/files/digest-pdftohtml-0.36-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75ad095bb51e1f66c9f7691e6af12f44 pdftohtml-0.36.tar.gz 300922
diff --git a/app-text/pdftohtml/files/digest-pdftohtml-0.36-r2 b/app-text/pdftohtml/files/digest-pdftohtml-0.36-r2
deleted file mode 100644
index 5ae8348e609f..000000000000
--- a/app-text/pdftohtml/files/digest-pdftohtml-0.36-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75ad095bb51e1f66c9f7691e6af12f44 pdftohtml-0.36.tar.gz 300922
diff --git a/app-text/pdftohtml/metadata.xml b/app-text/pdftohtml/metadata.xml
new file mode 100644
index 000000000000..1fa0ca569505
--- /dev/null
+++ b/app-text/pdftohtml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+</pkgmetadata>
diff --git a/app-text/pdftohtml/pdftohtml-0.36-r1.ebuild b/app-text/pdftohtml/pdftohtml-0.36-r1.ebuild
deleted file mode 100644
index 2b2c09742db7..000000000000
--- a/app-text/pdftohtml/pdftohtml-0.36-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r1.ebuild,v 1.3 2005/02/04 22:59:28 hansmi Exp $
-
-inherit eutils
-
-DESCRIPTION="pdftohtml is a utility which converts PDF files into HTML and XML formats"
-HOMEPAGE="http://pdftohtml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc ~amd64 ppc64"
-IUSE=""
-DEPEND="virtual/libc sys-devel/gcc"
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
-	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf-goo-sizet.patch
-	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf2-underflow.patch
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin pdftohtml
-	dodoc AUTHORS BUGS CHANGES COPYING README pdf2xml.dtd
-}
diff --git a/app-text/pdftohtml/pdftohtml-0.36-r2.ebuild b/app-text/pdftohtml/pdftohtml-0.36-r2.ebuild
deleted file mode 100644
index dc16985d4fde..000000000000
--- a/app-text/pdftohtml/pdftohtml-0.36-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r2.ebuild,v 1.5 2005/02/04 22:59:28 hansmi Exp $
-
-inherit eutils
-
-DESCRIPTION="pdftohtml is a utility which converts PDF files into HTML and XML formats"
-HOMEPAGE="http://pdftohtml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc ~amd64 ppc64"
-IUSE=""
-DEPEND="virtual/libc sys-devel/gcc"
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
-	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf-goo-sizet.patch
-	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf2-underflow.patch
-	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin pdftohtml
-	dodoc AUTHORS BUGS CHANGES COPYING README pdf2xml.dtd
-}
diff --git a/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild b/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild
index c0905a8bbb8d..c587bbc079ca 100644
--- a/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild
+++ b/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild,v 1.6 2005/02/09 14:17:28 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild,v 1.7 2005/03/16 12:48:44 lanius Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://pdftohtml.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ppc ~amd64 ppc64"
+KEYWORDS="x86 sparc ppc amd64 ppc64"
 IUSE=""
 DEPEND="virtual/libc sys-devel/gcc"
 RDEPEND="virtual/libc"
@@ -21,6 +21,9 @@ src_unpack() {
 	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf2-underflow.patch
 	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch
 	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl3-keylength.patch
+
+	# fix location of xpdfrc
+	sed -i "s:/usr/local/etc/xpdfrc:/etc/xpdfrc:" aconf.h
 }
 
 src_compile() {
diff --git a/app-text/pdftohtml/pdftohtml-0.36.ebuild b/app-text/pdftohtml/pdftohtml-0.36.ebuild
deleted file mode 100644
index 3060563e013d..000000000000
--- a/app-text/pdftohtml/pdftohtml-0.36.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36.ebuild,v 1.12 2005/02/04 22:59:28 hansmi Exp $
-
-DESCRIPTION="pdftohtml is a utility which converts PDF files into HTML and XML formats"
-HOMEPAGE="http://pdftohtml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc ~amd64 ppc64"
-IUSE=""
-DEPEND="virtual/libc sys-devel/gcc"
-RDEPEND="virtual/libc"
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin pdftohtml
-	dodoc AUTHORS BUGS CHANGES COPYING README pdf2xml.dtd
-}