Fix incorrect version string in upstream tarball, wrt bug #442482, add epatch_user. Drop broken ebuild

(Portage version: 2.2.0_alpha168/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 12 insertions, 75 deletions

diff --git a/app-text/linuxdoc-tools/ChangeLog b/app-text/linuxdoc-tools/ChangeLog
index ef08e083434d..be01d8369873 100644
--- a/app-text/linuxdoc-tools/ChangeLog
+++ b/app-text/linuxdoc-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/linuxdoc-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/ChangeLog,v 1.21 2013/03/21 12:54:43 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/ChangeLog,v 1.22 2013/03/22 07:04:38 pinkbyte Exp $
+
+  22 Mar 2013; Sergey Popov <pinkbyte@gentoo.org>
+  -linuxdoc-tools-0.9.68.ebuild, linuxdoc-tools-0.9.68-r1.ebuild:
+  Fix incorrect version string in upstream tarball, wrt bug #442482, add
+  epatch_user. Drop broken ebuild
 
 *linuxdoc-tools-0.9.68-r1 (21 Mar 2013)
 
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild
index c0ec8f6c5b70..861bcd21e70d 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild,v 1.1 2013/03/21 12:54:43 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild,v 1.2 2013/03/22 07:04:38 pinkbyte Exp $
 
 EAPI=5
 
@@ -39,6 +39,11 @@ src_prepare() {
 	sed -i -e \
 		's,/iso-entities-8879.1986/iso-entities.cat,/sgml-iso-entities-8879.1986/catalog,' \
 		perl5lib/LinuxDocTools.pm || die 'sed failed'
+
+	# Fix incorrect version string in upstream tarball
+	sed -i -e "s/0.9.66/${PV}/" VERSION || die 'sed on VERSION failed'
+
+	epatch_user
 }
 
 src_configure() {
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild
deleted file mode 100644
index 8356c6cb231e..000000000000
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild,v 1.2 2013/03/21 07:09:04 pinkbyte Exp $
-
-EAPI=2
-
-inherit eutils sgml-catalog toolchain-funcs
-
-DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
-HOMEPAGE="http://packages.qa.debian.org/l/linuxdoc-tools.html"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="MIT SGMLUG"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-
-IUSE=""
-
-DEPEND="app-text/openjade
-	app-text/opensp
-	app-text/sgml-common
-	dev-texlive/texlive-fontsrecommended
-	>=dev-lang/perl-5.004
-	sys-apps/gawk
-	sys-apps/groff
-	virtual/latex-base"
-
-RDEPEND="${DEPEND}"
-
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" \
-	"/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-letter.patch" \
-		"${FILESDIR}/${PN}-0.9.21-malloc.patch" \
-		"${FILESDIR}/${P}-compiler.patch" \
-		"${FILESDIR}/${P}-lex.patch"
-
-	# Wrong path for the catalog.
-	sed -i -e \
-		's,/iso-entities-8879.1986/iso-entities.cat,/sgml-iso-entities-8879.1986/catalog,' \
-		perl5lib/LinuxDocTools.pm || die 'sed failed'
-}
-
-src_configure() {
-	tc-export CC
-	econf --with-installed-iso-entities || die "./configure failed"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "Compilation failed"
-}
-
-src_install() {
-	# Else fails with sandbox violations
-	export VARTEXFONTS="${T}/fonts"
-
-	# Besides the path being wrong, in changing perl5libdir, it cannot find the
-	# catalog.
-	export SGML_CATALOG_FILES="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
-
-	eval `perl -V:installvendorarch`
-	einstall \
-		perl5libdir="${D}${installvendorarch}" \
-		LINUXDOCDOC="${D}/usr/share/doc/${PF}/guide" \
-		|| die "Installation failed"
-
-	insinto /usr/share/texmf/tex/latex/misc
-	doins tex/*.sty || die
-
-	dodoc ChangeLog README || die
-}