Migrate to EAPI 5. Add a patch to fix build failure with newer libgsf, wrt bug #465882.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 68 insertions, 10 deletions

diff --git a/app-text/wv2/ChangeLog b/app-text/wv2/ChangeLog
index c04081b3c314..c2e1f0a7fbb2 100644
--- a/app-text/wv2/ChangeLog
+++ b/app-text/wv2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/wv2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/ChangeLog,v 1.74 2012/12/20 15:03:40 kensington Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/ChangeLog,v 1.75 2013/04/15 12:35:54 kensington Exp $
+
+*wv2-0.4.2-r2 (15 Apr 2013)
+
+  15 Apr 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/wv2-0.4.2-libgsf.patch, +wv2-0.4.2-r2.ebuild:
+  Migrate to EAPI 5. Add a patch to fix build failure with newer libgsf, wrt bug
+  #465882.
 
   20 Dec 2012; Michael Palimaka <kensington@gentoo.org> -wv2-0.4.2.ebuild:
   Remove old.
diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest
index baac3607a84c..26cbb952fabc 100644
--- a/app-text/wv2/Manifest
+++ b/app-text/wv2/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 AUX wv2-0.4.2-glib.patch 307 SHA256 dfb85e8069b1a483e9009d6e2d0e4d4b9ef5a2c23f0b6849209497ab6dff1412 SHA512 094b7b293dcd5e50c2b6cddbd6f01f3ed8279388fefdf95b35026d930593ce366e95b50c88c510d6a6f4133d8e1d08d4dcf8c925510104098e77bd94cf2ebbc8 WHIRLPOOL 02bab4b1c6a5998e2a075b71e64bc81289f52410e4a2b697063bb34951f65c5890ea10e181847fcac34bea5d7ac329c1abebcdc8b79cf5030a9fa20bee5cafb1
+AUX wv2-0.4.2-libgsf.patch 421 SHA256 49a0d302f47f1c8501a496774bcdafdd10062d7c44e53e1cd39002538a676338 SHA512 ff42d9fb5191d1e384094f000380bf49cfde89a5f95c9962b0dc02ba226a58e7b47491af317cb2287fdb7d99587352e774a1f2ed8025fa708d0dac0649b6c8e1 WHIRLPOOL f2017339c4dc31d394f5985a18c275594054ce8910c115571e59f8e2dcc724d1f4c5fa4ef0cd02bf7459d7074d6e5c7e30a98a1faed12915fc230f17db019977
 DIST wv2-0.4.2.tar.bz2 452759 SHA256 9f2b6d3910cb0e29c9ff432f935a594ceec0101bca46ba2fc251aff251ee38dc SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b WHIRLPOOL 75dd1936ca794bfcdfe69e009b2f7a77f8bf7e7a4270f0dc1b23255232cf235508311bd93c91a10075ef54b6a4149b045548f5fc7587d48d44af7ee1d61f5e2e
 EBUILD wv2-0.4.2-r1.ebuild 825 SHA256 59bb499697e64a5a239f8a5e0bd59b4c56cd28dea2cf705f912dc933946772fe SHA512 9a97235a56521bcf403bdc87029314cad0ad16886229f0fb32b80ba4cc015d3cc64ef2726f730408c71b47fffed0651943698a9b14d13d59c5a58db0bc8bd4cc WHIRLPOOL ad155240d059a4383b955a8c6f597c5d0031298c6108a97e26d0e073ed34dc5a3636e4f8f9b4928459a11c9e13d6b376cfbcc8085e230cfb90f0655d04340451
-MISC ChangeLog 8772 SHA256 0a3e763816002bae8b678dc43476451797a80d50326edd53aa68daac512ac7b3 SHA512 7129a87908597771f733434d890aa0485d282c3a6377a391b323630295e5549f6e926fa64e43f54582906181c09d1e46ea52b99a3782f3d6f12bfaf318dec466 WHIRLPOOL 7e336ed525b363ef814904e9138bd60f746085b602d35813fbfe3c888aea6b23a7c9b72b078b08b33633efbd34f632da2f364db53c55912fc74150ce6cc2cdb1
+EBUILD wv2-0.4.2-r2.ebuild 872 SHA256 d90670053dff7f4d785e2257240875c8de2061f2fbbd8cf38aa8effebf13dbae SHA512 396994294c61a00ab9f51068612c3c98879e208d820c75ffcb8c0613381b832c945b3d03af8873b563c6b4852e69ae3c78383febda84dca137560e6f940a000a WHIRLPOOL 6a8c9321307469805abc42912ea701c311d773050f0b4d91c323f842ebc10c94d6541e3c69573314cb880fa1e8353dba917bca520e11f5491bea7d5a39ca246d
+MISC ChangeLog 9005 SHA256 f73c5140b8a58024275d5878a7c983980a48d03ae43dbb393a936c2a2927e3ee SHA512 7a86dfdb95620cdf2d3f81c85503a8b54cbb1deb3a04b8cb225dff3e9c6f27e0b84569e7e07e6571b228e26a7b76f709a56b518b2db6031b23b206722db39489 WHIRLPOOL f3e748e622137a0e47013e374ae69dbc6c9b6c274e0acd6fa18c7366fd1678ac64df382e276e2c8c06ee748d33001dd160aeed198513648a51ce89a914a832f1
 MISC metadata.xml 319 SHA256 77132a4d3ee74efb975bbc191f3efdbea4d9ecb7f188c90d47ea1f69f135e4e2 SHA512 aa3d7e6ddc709f4fe2c3750fbc403d5b3e65b592926d18504107d8ab16a22bbebda2d39ec566426c4c1fa37aefdb60f5c6083c455721f69a09ad8d1361b9111e WHIRLPOOL df439a4dc664f43286cc1d3fde5b672dd9a45e76bbc35e54c538f45dfb98c08471b1802ac30a0d82702f6c85bc704e6a804a3f34ae52c5bfff9e17e34d751d57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ0ygZAAoJEMbwO6tnXQ0s5rsH/0KH71fxfmmN6ShUVzldtxpl
-tg8ZukjkU9qjTAnKo6tFaGRgatkYtQAo3cJqlWOb++qQVYXR6gmDA861fRHvH24R
-T0NqHGLn2hJMy0VqfJ3/tTLThlunLFf2/IuCgrZUTcC5qR4YggXO6pxyQOZt/05S
-p+utEd3GF4vlfhxaU3bJtWyJnQVM01G2IujtynX7z/O1nmEfUZrvko9IjipozbZW
-42fQwEIwqtv9hgSuTb+Js/U5jWJtS2/AnAcVk/F4LEl3Gq/oXS8+qTYuLzv8gn48
-MEQxidz20X3yzDhBwcxdBevqKdMj8m+K3ESYdytnFVkERE6pbsrvCf3UPqlKMts=
-=SsyD
+iQEcBAEBCAAGBQJRa/QAAAoJEMbwO6tnXQ0suawIAKh8GAb0h6wML2YOMs82rbU6
+YZaO03p6DRQ/GWNXqJn7b4EmUSCAru8RHZQnsLaSKAzWFMJE/j8T34fTIpQbv42O
+mfCr44wxlefKDb9eonQuO2F26ql+jlpo2kgeQ3/XVqJnBYQXLoSwRWvYsyfv5VHr
+TuCUfHvtz8uPKuXu58tvDxoTbCGoOc822MUFW4fqSxqm05C4KdrBNXmf5AU0Ip/x
+sTT4KfV1cS9ds9lF6edtAHaNseWR3qCTwepSrVdZbTkxiCnxq3UXIMeWMhXE+06E
+FKPfEQcaxSoyx30Wtixd46nyKSJk5PU66purMKj0KoQecLG3WBS4zxZx1udhGcg=
+=twaX
 -----END PGP SIGNATURE-----
diff --git a/app-text/wv2/files/wv2-0.4.2-libgsf.patch b/app-text/wv2/files/wv2-0.4.2-libgsf.patch
new file mode 100644
index 000000000000..2367c24aad0b
--- /dev/null
+++ b/app-text/wv2/files/wv2-0.4.2-libgsf.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=465882
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -34,7 +34,7 @@
+   FIND_PACKAGE( ZLIB REQUIRED )
+ ENDIF( WITH_ZLIB )
+ 
+-INCLUDE_DIRECTORIES( ${GLIB2_INCLUDE_DIR} ${LIBGSF_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
++INCLUDE_DIRECTORIES( ${GLIB2_INCLUDE_DIR} ${LIBGSF_INCLUDE_DIR} ${PC_LIBGSF_INCLUDE_DIRS} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+ 
+ #
+ # Iconv checks
diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r2.ebuild
new file mode 100644
index 000000000000..4581dbb54a79
--- /dev/null
+++ b/app-text/wv2/wv2-0.4.2-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/wv2-0.4.2-r2.ebuild,v 1.1 2013/04/15 12:35:54 kensington Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Excellent MS Word filter lib, used in most Office suites"
+HOMEPAGE="http://wvware.sourceforge.net"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="zlib"
+
+RDEPEND="dev-libs/glib
+	>=gnome-extra/libgsf-1.8:=
+	virtual/libiconv
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO )
+PATCHES=(
+	"${FILESDIR}/${P}-glib.patch"
+	"${FILESDIR}/${P}-libgsf.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with zlib)
+	)
+	cmake-utils_src_configure
+}