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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

6 files changed, 67 insertions, 33 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/Manifest b/dev-tcltk/tkzinc/Manifest
index 64d9e7575c13..0a4337d8ee0f 100644
--- a/dev-tcltk/tkzinc/Manifest
+++ b/dev-tcltk/tkzinc/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 3.3.4-ldflags.patch 552 SHA256 297ba730e1af946c4023d05fde17feb3d0ab0e41c9bfc85ca8b7d77fc20ad44b SHA512 6f304b7f950d2e48a85a37480c1adbd2120e6b75449c40e3a9313c880118eba95d5be49198f81a75e4248342c97712ddc69fc7d40c2e2ca285d4d9ae3b531773 WHIRLPOOL 4088ff49ece714a15e143e73ef90648e787711fa8e0169836c7353744a31ab5ed337e7fbe83577ca30b07f1a373d86f1bd571abf4e78dc1d9be107c80dab0e23
 AUX 3.3.6-ldflags.patch 552 SHA256 3a301c752e78400ba8b91469f990e44ee1d6f6af0aca6431cb9fcd56ab26c438 SHA512 5ef1d02ac3b6eaffc4c7310e80e27204c5eb0ccc9d6627a5da4598a6b13d20fa1a1eab63194578a56a0650eb07c70879370e64030ccf86caf5226a1d1c6fea7e WHIRLPOOL 0b6f728332198392ec8f580ba331fdbad4b5179aaaa9e8053b990641e3ab5c3e8f8b53c5b71db31dba1decd360aa5d6667e31cacf753ce6195176aac9795018e
+AUX tkzinc-3.3.4-latex.patch 331 SHA256 6fdde5a64a28a648ba91edea435c0584a58d1e5ad637b22c469a989807a3ded4 SHA512 20e859529ff20b41193a43baeec4c632107208311de3815795cc2a013741034dac36880d88c11e7dc1c4719259e42a180203c1ac478251ff81eec0e3d7f77ee4 WHIRLPOOL c7e768996db73316a29212a910895b103dbb5e32b34e75eddd1ef018fe73b16868e280a12e1a00fcdbc56ff1631ac6e7ff921f53536c16d46d9af15f7f4c6446
 DIST Tkzinc-3.3.6plus.tar.gz 1924729 SHA256 6a23a647a2062bc9f5a773092cbb6c63ee5e7564a8c8751839dcca79d807ff56 SHA512 ead998b69569ebec92e7f60415296262f60b91250b2fe15fdeb9fb71c38756006bedcd9ed2829d915cb6ce3a6461165a48c9037f8e397ba6049a76ae474f7838 WHIRLPOOL 65e30a3e3bd553145d918373f272cf7969a02111ed3b18fd407f234357ffc0223449b1e85796d5e501e8020eb616624ebbf1b4c1d2b1bc365399ded45ebdb552
 DIST zinc-tk_3.3.4.tar.gz 2785947 SHA256 5f65fd1bf8e2d26736c892758b74259eb8642346b92d6467ea8653b5f744e26c SHA512 ed73637ec6abfc61b6f9ca87e38a4cd8c93764bc541828f06c6d130de7ebc528bce62e95af429015558b4f2d4bb6d33b45c581188a420b04aa3f416324cf8d69 WHIRLPOOL 3b41e3b1dcad597774a491f475a90f380a0ac09c8f6220054a53a8bb0f1d462eb0ea352a08fa22ecbda964df4ac75056eeff0909edb91be1e91897fd1fad69f4
-EBUILD tkzinc-3.3.4.ebuild 1070 SHA256 842824d8c24ff01ae1c4d289e4a98871d7679af9a49c0b69923f2a6c4da79ed1 SHA512 df427ecd6ca6fead00ab3f6d9a00fdf5f2abbedfb73379488e40d1a217388f3fb5318544e6e00579f15b3e92a89e5eca4c3a6148061acc27513695af795da3ec WHIRLPOOL ebb67797af2066684e42ce95aeedbbb5f368d8eb8dd9af40403f824633e37b491ee78bf83460bec8bbc45354452dbbaa29bef33883186af008e71dd687a1ee14
-EBUILD tkzinc-3.3.6.ebuild 1083 SHA256 7f2b2bfc564042e7496ddb73302199bec177a4e6fcbeb0b892bacf7a9b3fb23a SHA512 bdec65f1dfdd82730e1b42c39b217be01b5ca1b8e17c09bfec3eea87123b57f733bab58bd5a5b95141d8dea692145432938cccdf219b235c2d498705a8c8eacf WHIRLPOOL 898ed7e890ef5017ce850f1e4af30199aa4573c1eb171ab8539c98539abc0433107595840915e253f9345ad3ad8e01f2c218b68ccb09ef4bd8afb42de216f047
-MISC ChangeLog 1409 SHA256 7520dc3dbb6834b6ae7e305840a2bfcf8569c2dda5651b8e9a5936cb48b7c499 SHA512 977f532d36c64ef696b40f6f2cf2fb5c99128f7e3468141a7e0effd3aba6fb3ddfef72355aed38f25064247619aecc8430b2eb235958512547508d71382aa610 WHIRLPOOL 3f3f70cef914f4d9998b319abbab0c1ee76c4c6be86a262679d6fb390031207e6bb7ff692355f4dc54ee103ad2f7f2a80c4430b060c110d91301364a111381db
-MISC metadata.xml 260 SHA256 1050070bd73b44e9311028cf233b7df52feee364c22b9524ec94737d0017a682 SHA512 55b84ec71c6c7e744eb2aabfb3b3fdd7d8e399aaa68a5f049afab1a1c2ac88c094be61e1875b01a820dcdc73d9434197fb3f4aa616537e2eb10a9f6a27783de8 WHIRLPOOL c18944612f4832ce0c6d3925d645a054e6fb1cb38cab7e8aeb06290c74abc240f56555a34b3754519d1e3ec69b5c8427196063c64845b74fb8dc1878896d780b
+EBUILD tkzinc-3.3.4.ebuild 1109 SHA256 beab786fc81a9afe0bc95010d839b05912496b0943ffa772b0372dcb2afe3283 SHA512 fe868676ca88c5778c7586e265c5daa31bdc7b196c9e48d6157c2934d56e1117c0bf836984f58efd518bda56b0d456ce1153d7d2a8b48c6f8dbcf76cf9e285d4 WHIRLPOOL c72be49af5e9b40f5d388c31b8b0f31d2addcee97955ee1ec55d07b4d7c61a25e91aa7744ed7ab903cabe7c3231404bc5b5d3ba0715bed4c6d0828fe0190f6d4
+EBUILD tkzinc-3.3.6.ebuild 1098 SHA256 5892dfdf9ca2a33fe985b48a6b7bf2481a82f45f0f6ad3454376ceff8b42cf8d SHA512 d2d1e880c37a749e416c7be108a7c9ea847867606d0dc2a8f008ca16320183346fbf7bc6a302c1259b6d7a227d668884584b4e49de13955545844f7783afbb88 WHIRLPOOL 2ee14e85a449e197c2f6469d721c152b9a34ddd2e615b4d7031bbce4ad69d6ae887ef792a83430c2e936f1ebfe35ea16ad3bcf25de56de6394b97597f177ab74
+MISC ChangeLog 1616 SHA256 875d86e8a2e65a8ca22b0c58b023e262636d1feefa9c30e1b169a295ebb0da35 SHA512 04cec1307614a276566526bc87b190de5ecccc16d2dc7b0903a5d74e77847b96e1ecb4a55e7fae6b7cc6a0036fdaf92f9230e9ec3e5f3c54501eb7b5534b69f7 WHIRLPOOL 86703e09348e9e2eacd4574f41f54dfdf4fa66f151cd473cf16de4d23b2bd3fb13353525df41ec734a7ddb077fdb7602a81b2c34af0de15c81e9b20d02dc7212
+MISC metadata.xml 272 SHA256 623c8a2dae72b108b4c166f8b52464836d1fe03c80c97f4ac896768bdbffb9bc SHA512 fd47730df0a833fb10d4dab28751952d7842e63d88a9f324e0fd674af9e50e6436269b89a9b19cd95623e54ed0663129500b059250591d24680b609fa5662829 WHIRLPOOL 94e45df6eea09e9fbdd1e126735ea84c469708cc129f6e88c1499269a4923718cc6810586b9af029cb7fdaf8b5094d03c2b7ec73d480c0c0df96476035c3feb0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlDsQ3YACgkQgAnW8HDreRaBnACgsna1r1NyvRuW/gNvH142558K
+qEYAn2QxwTjmBEwhkm9NhEoGa/28C3PA
+=yfI6
+-----END PGP SIGNATURE-----
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
 }