dev-tcltk/tkzinc: Add fix for doc building, #450874; move to autotools_utils.eclass

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

5 files changed, 52 insertions, 29 deletions

diff --git a/dev-tcltk/tkzinc/ChangeLog b/dev-tcltk/tkzinc/ChangeLog
index de98ab48239e..d94aedc5b8dc 100644
--- a/dev-tcltk/tkzinc/ChangeLog
+++ b/dev-tcltk/tkzinc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/tkzinc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/ChangeLog,v 1.7 2010/12/07 18:36:10 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/ChangeLog,v 1.8 2013/01/08 16:04:05 jlec Exp $
+
+  08 Jan 2013; Justin Lecher <jlec@gentoo.org> tkzinc-3.3.4.ebuild,
+  +files/tkzinc-3.3.4-latex.patch, tkzinc-3.3.6.ebuild, metadata.xml:
+  Add fix for doc building, #450874; move to autotools_utils.eclass
 
 *tkzinc-3.3.6 (07 Dec 2010)
 
diff --git a/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch b/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
new file mode 100644
index 000000000000..6b697a7bfd78
--- /dev/null
+++ b/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
@@ -0,0 +1,12 @@
+ doc/refman.tex | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/doc/refman.tex b/doc/refman.tex
+index b384e97..be88fde 100644
+--- a/doc/refman.tex
++++ b/doc/refman.tex
+@@ -1,3 +1,4 @@
++\RequirePackage{ifpdf}
+ \documentclass[11pt,twoside,a4paper]{book}
+ 
+ %----------------------------------------------------------------------
diff --git a/dev-tcltk/tkzinc/metadata.xml b/dev-tcltk/tkzinc/metadata.xml
index 17225ec3baf3..94d2144dccaa 100644
--- a/dev-tcltk/tkzinc/metadata.xml
+++ b/dev-tcltk/tkzinc/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
-<maintainer>
-  <email>tcltk@gentoo.org</email>
-<description>TCL / TK Herd</description>
-</maintainer>
+  <herd>tcltk</herd>
+  <maintainer>
+    <email>tcltk@gentoo.org</email>
+    <description>TCL / TK Herd</description>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild
index 7361107293c4..eca4b042dbf3 100644
--- a/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild
+++ b/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild,v 1.4 2010/12/07 18:36:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild,v 1.5 2013/01/08 16:04:05 jlec Exp $
 
 EAPI="3"
 
@@ -25,7 +25,9 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/Tkzinc"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-ldflags.patch
+	epatch \
+		"${FILESDIR}"/${PV}-ldflags.patch \
+		"${FILESDIR}"/${P}-latex.patch
 	eautoreconf
 }
 
diff --git a/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
index 2668605ed975..5f8ac6724890 100644
--- a/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
+++ b/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild,v 1.1 2010/12/07 18:36:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild,v 1.2 2013/01/08 16:04:05 jlec Exp $
 
-EAPI="3"
+EAPI=5
 
-inherit autotools eutils
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils
 
 DESCRIPTION="A Tk widget library."
 HOMEPAGE="http://www.tkzinc.org"
@@ -24,30 +26,33 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/Tkzinc-${PV//.}+"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-ldflags.patch
-	eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PN}-3.3.4-latex.patch
+	)
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+DOCS=( BUGS )
 
 src_configure() {
-	econf \
-		--enable-shared \
-		--enable-gl=damage \
-		$(use_enable debug symbols) \
+	local myeconfargs=(
+		--enable-shared
+		--enable-gl=damage
+		$(use_enable debug symbols)
 		$(use_enable threads)
+	)
+	autotools-utils_src_configure
 }
 
 src_compile() {
-	emake || die "make failed"
-	if use doc ; then
-		emake pdf || die "make pdf files failed"
-	fi
+	autotools-utils_src_compile
+	use doc && emake pdf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	autotools-utils_src_install
 
-	dodoc BUGS README || die
-	dohtml -r doc/* || die
+	dohtml -r doc/*
 	use doc && dodoc doc/refman.pdf
 }