media-libs/libwmf: Fix obsolete macros to work with automake-1.13, #467462; move to autotools-utils.eclass

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 128 insertions, 20 deletions

diff --git a/media-libs/libwmf/ChangeLog b/media-libs/libwmf/ChangeLog
index 91ed0f249e75..957776c8b3ad 100644
--- a/media-libs/libwmf/ChangeLog
+++ b/media-libs/libwmf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libwmf
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.83 2012/05/12 06:59:58 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.84 2013/05/04 12:26:08 jlec Exp $
+
+*libwmf-0.2.8.4-r5 (04 May 2013)
+
+  04 May 2013; Justin Lecher <jlec@gentoo.org> +libwmf-0.2.8.4-r5.ebuild,
+  metadata.xml:
+  Fix obsolete macros to work with automake-1.13, #467462; move to
+  autotools-utils.eclass
 
   12 May 2012; Pacho Ramos <pacho@gentoo.org> libwmf-0.2.8.4-r4.ebuild:
   Fix typo, move from 'disable' to 'without' configure option, bug #415293 by
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index fba75c214e2c..743e8c7dffcb 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX libwmf-0.2.8.4-build.patch 1340 RMD160 d0ee933b7bd3d3b299859c8c36e542298049343b SHA1 81e1f460c426c3db37606ec3cc8da66b52c11fa3 SHA256 e12d0cd079b70fc83f87f09d262eee901707f27fe5f509e65ff108aa8cdccadb
-AUX libwmf-0.2.8.4-gdk-pixbuf.patch 1037 RMD160 a26cd1d8b59d17347e2c0b7cc49fac6b85206aa7 SHA1 5430f72c608c983ba3946ba7171bf3a6a5119a87 SHA256 fcfbc4ae5bc086c934fbe785ca21dacad90ef58e56aa52a58f3d29931b21c839
-AUX libwmf-0.2.8.4-intoverflow.patch 971 RMD160 4b5c414021a2b663032aa90e9f40f05e1389b503 SHA1 6f130ea9f639ccf88fef0fda74cf9fa3956f81b5 SHA256 b19f80f742c22138beb6d1943f6cbedc0db2a8c72419bf8bf9216e1f806d4690
-AUX libwmf-0.2.8.4-libpng-1.5.patch 478 RMD160 402a268f8b94218b19c131846a4d571dcd22b3fa SHA1 42aa4c2a82e4e14044c875a7f439baea732a355a SHA256 ffad4b3657725028bf3250f3555275373b800eacd6b6be5512ef3e5f76563181
-AUX libwmf-0.2.8.4-pngfix.patch 582 RMD160 1a723c2e0d1dd16b6788f0ead2277e8996ab8ea1 SHA1 f392fd1a1053b84336bfb72e27aebbb78826239a SHA256 39a47d2d12720cc98ee4669e44c012e855df5de0dcec0636f1fb12918c2d8006
-AUX libwmf-0.2.8.4-use-system-fonts.patch 840 RMD160 28ff35be124c3070836e5d4e93772892b395931e SHA1 3936dda44d1d09e272346d9ae8d2fd9b90fe775e SHA256 b99aea69f5c83ccecaca0f74c7d5bbdac2bb7c6c7991bf30d8c64616edddc469
-DIST libwmf-0.2.8.4.tar.gz 2169375 RMD160 98cd631adb5bb332d9224d04bc8a265c105435f2 SHA1 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89 SHA256 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8
-EBUILD libwmf-0.2.8.4-r4.ebuild 2473 RMD160 8f057c9f5d4afbd7e020c74bd46e0acc11c8f20a SHA1 7c2e7f9eed362f7e885161f8d50038ee71690abd SHA256 c1c1f3ba1203b5517f0ea897422cd0883adeeff73c5404622b50e9abe63a7183
-MISC ChangeLog 11843 RMD160 7e7b83405276f71d7502c6ed71df93d55efa422d SHA1 afd3058eec6574faaffb15fd57b602099e88d4f6 SHA256 4140ddc2900eafd006f80cc99c89c61252e4c7690de441ffbc9920811b88b4a3
-MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
+AUX libwmf-0.2.8.4-build.patch 1340 SHA256 e12d0cd079b70fc83f87f09d262eee901707f27fe5f509e65ff108aa8cdccadb SHA512 de48cf695e0c1a3d9b97e2dbd4db9ccc2c633269de88be8799e5cf37dbd6a5bb70cae36b203ed2bc22f22a38970faa4feeb0b7aa11aa290f68dadd2b3a5dd2f6 WHIRLPOOL 07f139f417251ccdb00b33a46f8124766b2ce8c537f69373b5191f8a537ed4330bf2c1363cf21d9946f901f1a0d001c034b7066d007e6bc9b7f9176bc8154251
+AUX libwmf-0.2.8.4-gdk-pixbuf.patch 1037 SHA256 fcfbc4ae5bc086c934fbe785ca21dacad90ef58e56aa52a58f3d29931b21c839 SHA512 2a03dffdcf2f8e6181f4468b69dc6dce4b01d9258f7596ffce83a555bed14e429e60848ba26fe7bece309430f9c2a90eec84802221d136f15058207b183382a0 WHIRLPOOL a8d17ef71da7605fe0b94eb77d2cf15ec516b6aa70442536b95bbab004944bccb9273567dfd74283c9549a720f7b66f735a732dbccf11e588ab529b3551cbe59
+AUX libwmf-0.2.8.4-intoverflow.patch 971 SHA256 b19f80f742c22138beb6d1943f6cbedc0db2a8c72419bf8bf9216e1f806d4690 SHA512 939b729d2ca9c1204e623d50151d2a736904455e716ce917da83e454dc99165b77c2039413174bd9e219dc7453ef3c92348cc7bf1e3a1ade1d5040a81eb7cdee WHIRLPOOL 9baa124817974ae0adde1d3d2e85a80e73f8c85fc97f9088197df0dc7adee4008682250e1a177d13ee7ee4446a792d002f12a7c08bb14d77400bb12b79d80889
+AUX libwmf-0.2.8.4-libpng-1.5.patch 478 SHA256 ffad4b3657725028bf3250f3555275373b800eacd6b6be5512ef3e5f76563181 SHA512 acfa95c22d3d352b270d41cd814c1c876536da9a08a19eb40acb9770913fbd824654c90223413507d714248321cd6be9190187d3b00a75ed4a0a001a0800617c WHIRLPOOL 99ce6e8841552deffcbc570a1aa69fa5d1a7afb61426224c167b39772c2929719a533ad054655fce3607a709f458cada7be7291df0df496fa767d28555840596
+AUX libwmf-0.2.8.4-pngfix.patch 582 SHA256 39a47d2d12720cc98ee4669e44c012e855df5de0dcec0636f1fb12918c2d8006 SHA512 02170d7ec2cd0e987567becd995416c52b85d3f55d6e0e236ea8eeacdb3218edc1a1647d96f24b3dbe904ea3bcc6cacef1a6d82a0fbfa9d808dc061e11a154f7 WHIRLPOOL ba610a005c06fc1e1878cf4cac5403020270afa77df7624ba2adf19179e9e82dc6b137919f8c9c068f49ea054e88e9e4bd194666fbc115756f37cb789feec5a4
+AUX libwmf-0.2.8.4-use-system-fonts.patch 840 SHA256 b99aea69f5c83ccecaca0f74c7d5bbdac2bb7c6c7991bf30d8c64616edddc469 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c WHIRLPOOL eb0297267c74eb19713011392822e10e640b59eabdd58d06de3c7a6cc99046f7c8e7ced40a27d990e280de6c4f8c634e7ade7a81d5117e52d458854c631e20a7
+DIST libwmf-0.2.8.4.tar.gz 2169375 SHA256 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8 SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5 WHIRLPOOL e6f9378fcb3363d62eb7bb12dca93a496954971a4c17359b8276c675557f892dee19843598c9d21987bf50ecc42083e7cec420e95e7052974a5843696ae0fd1e
+EBUILD libwmf-0.2.8.4-r4.ebuild 2473 SHA256 c1c1f3ba1203b5517f0ea897422cd0883adeeff73c5404622b50e9abe63a7183 SHA512 dcc7dce01f3688a2969e223dc118f6bac969502f216b295ee310ad5c81684a891b04dd354024a39f158dac45e81fc3df0ec125a56717b7faa08fc38c7feacf04 WHIRLPOOL 2da20fb8d9f4c12c8de624245e5eb1db4f11e7ad931f43fe72e875e76fb7617fa7b41abd6071db0e9aaa8680f3017e3f7f3e72f8aa2dae919989ecbadf8d6ec0
+EBUILD libwmf-0.2.8.4-r5.ebuild 2586 SHA256 ce9eefe38f8158241dc8180347392db3bacd5b69bfff5ec3d5e46cd19aae4a95 SHA512 3cbf8e81828ae1d1a34c4f41ebabcf81fe329f8a0e2ff758c14ef9815645a0df31f1e89f4e0dcac5d7e8bc072a58859023354c6fefb7a4657ef78f4a92da56b1 WHIRLPOOL 2b718c4d272ada9670db7e14c2d134da5bae40613573e9facf2743f6990e6b7a1266bca44a3420fe166a4f074a05ef6ee804526a2e4a9f4f883637ae9e05b0a3
+MISC ChangeLog 12059 SHA256 e59ed33e19a55391fcd1f909eb24a6a612741ae332b97df49f74b61081bb84f8 SHA512 980af217462bea4aacc087a4c10177accd838118f5133c5b09972e42d193cd63fb4da837442f60a027b5e131be60ce23c272d0969a039ff8be81008692b4253b WHIRLPOOL 2d080327b15ec6561937e19e752506171b3c6eeeef42a24f66ca61f0db6bc1015f812852779a6eac13ef4907000c2d9e1dbb1369d9d4cb1117547f5ff0a7bc3a
+MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+uCnMACgkQCaWpQKGI+9QtrwCfZ/gBra286QFHg9AqdbEn0vLO
-NhMAn3HSw5Wz9ntxlnH3wJjs3ClheCg0
-=/7xl
+iEYEAREKAAYFAlGE/mkACgkQgAnW8HDreRaXjQCfRN582lClyT6if7ysjGPEMMzR
+E2YAn0bHjkYEIl+qgCYcKucP5pvScVXe
+=li7d
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild
new file mode 100644
index 000000000000..2593bb6bdd7b
--- /dev/null
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild,v 1.1 2013/05/04 12:26:08 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+#The configure script finds the 5.50 ghostscript Fontmap file while run.
+#This will probably work, especially since the real one (6.50) in this case
+#is empty. However beware in case there is any trouble
+
+DESCRIPTION="library for converting WMF files"
+HOMEPAGE="http://wvware.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="X debug doc expat xml"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	media-fonts/urw-fonts
+	>=media-libs/freetype-2.0.1
+	>=media-libs/libpng-1.4
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2[X?]
+	virtual/jpeg
+	xml? (
+		expat? ( dev-libs/expat )
+		!expat? (  dev-libs/libxml2 )
+	)
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? (
+		x11-libs/libXt
+		x11-libs/libXpm
+	)"
+# plotutils are not really supported yet, so looks like that's it
+
+REQUIRED_USE="expat? ( xml )"
+
+DOCS=( README AUTHORS CREDITS ChangeLog NEWS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-intoverflow.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-pngfix.patch
+	"${FILESDIR}"/${P}-libpng-1.5.patch
+	"${FILESDIR}"/${P}-use-system-fonts.patch
+	"${FILESDIR}"/${P}-gdk-pixbuf.patch
+	)
+
+src_prepare() {
+	if ! use doc ; then
+		sed -e 's:doc::' -i Makefile.am || die
+	fi
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myconfargs=()
+	# NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, that gd is built
+	# and included in libwmf. Since nothing in-tree seems to use media-libs/libwmf[gd],
+	# we're explicitly disabling gd use w.r.t. bug 268161
+	if use expat; then
+		myeconfargs+=( --without-libxml2 )
+	else
+		myeconfargs+=( $(use_with xml libxml2) )
+	fi
+
+	myeconfargs+=(
+		--disable-static
+		$(use_enable debug)
+		$(use_with X x)
+		$(use_with expat)
+		--disable-gd
+		--with-sys-gd
+		--with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts
+		--with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts/
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	MAKEOPTS+=" -j1"
+	autotools-utils_src_install
+}
diff --git a/media-libs/libwmf/metadata.xml b/media-libs/libwmf/metadata.xml
index d9cd2cad66c2..1470e032181b 100644
--- a/media-libs/libwmf/metadata.xml
+++ b/media-libs/libwmf/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>