Fix patch, bug 477114, Move to EAPI 5.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

4 files changed, 30 insertions, 49 deletions

diff --git a/media-libs/quarter/ChangeLog b/media-libs/quarter/ChangeLog
index b2458984b9d3..8bd93734fd4a 100644
--- a/media-libs/quarter/ChangeLog
+++ b/media-libs/quarter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/quarter
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/ChangeLog,v 1.6 2013/03/02 21:48:45 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/ChangeLog,v 1.7 2014/08/14 00:15:23 reavertm Exp $
+
+  14 Aug 2014; Maciej Mrozowski <reavertm@gentoo.org>
+  files/quarter-1.0.0-gcc44.patch, quarter-1.0.0-r1.ebuild:
+  Fix patch, bug 477114, Move to EAPI 5.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> quarter-1.0.0-r1.ebuild:
   Move Qt dependencies to the new category
diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest
index f2a88e71ff20..c38919d86cd4 100644
--- a/media-libs/quarter/Manifest
+++ b/media-libs/quarter/Manifest
@@ -1,27 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX quarter-1.0.0-gcc44.patch 362 SHA256 553f8a82511027f76bbb1ecf47afacfbdc322315ca91c06a01387f6253add735 SHA512 121d57de607e9f4a4c7149669836991c6e2b8a3b7452c95cccc36d41c410529a170f879193a4534f83b0a049aaa33fe7797898f5cbc447906ce632219125b99b WHIRLPOOL 39160eed03a36e1787bc5cc5faf6a06e07aba87eeed9fbc96175ff794f2da0674f18e6b28fd56f0e3cb0e61bb2939084f749716da8195fd2b6850c1f9185daf5
-DIST Quarter-1.0.0.tar.gz 617534 SHA256 ed7a29856e2bdc9db20b7c4fa27c47af1bf325d62ef3700fccbc83476f41da1a
-EBUILD quarter-1.0.0-r1.ebuild 1217 SHA256 f8b0f3047b04d5eaa9456c55c931ab31fc8aaea23ea1d7a49a81579e79101d7a SHA512 855e958d12b753084d087944f7e18d7ea2a4a3e23868086627df794cc280aa6ca75a2f2012be6ccd2ca0426d7671f3e4994d47b5eb72ac21f61d04a8b5c335b4 WHIRLPOOL 081ec84cd90b4ff589879659ed22bf0bf19d90656863641fdc1a197a5bc9df170d41c215a42b4a50fa6544d5bf1041c4084f9fd3da81ccb342ff32e29b1561ff
-MISC ChangeLog 1118 SHA256 c0e0dabec37e2156c314fe8c5dd7502fb8ca64d424bed29eb7b0bc0a2d2d98f7 SHA512 6af84917026967dc7fc37a5f1efe8586d3b432422634057a974823bed88a6a40f498065dee2efe54aadbbef7247838aef80b449a2aaa805eebfd8f439dc38900 WHIRLPOOL 7221c76337bbb8ccbedaa607f1a5c5d8d31e3e389bb5bf305cf41885b0890e87df511932163766d760628df2faa8469572fbca0e413ab83c038ea07c38626897
+AUX quarter-1.0.0-gcc44.patch 359 SHA256 d143a65a951e28699c5201d950dd5d8e69f38b871650fbf331004b9836ba98a0 SHA512 67805e87cff20da92f6ec2141fadc3a407677aa33f8f48a3c892a34158c8b175c4f4021c300215ce3ca5690824279f982d5aebfaca387fbeea332c97ee2a7673 WHIRLPOOL dfbb12d43c84d3f3e898a9a54daa37af247c02adef9fd951af744833261e697b1e5ae92f893630ad61a97e8a233d1637a0420f655fb1b7363c8a3cca6433246b
+DIST Quarter-1.0.0.tar.gz 617534 SHA256 ed7a29856e2bdc9db20b7c4fa27c47af1bf325d62ef3700fccbc83476f41da1a SHA512 ab7828889b612425c6341f69abaf6bc5c02ed5f918a5ad631ad9e0a6ecb9fd5800e08d091fd39bb05141e0db521d305471f66a3d14f149928add3f1d776e497b WHIRLPOOL cfb6f8d770449b7b00fa04c60f6607b87a4c5620a1b5363e46bdc3e62eb39ec42d6a0a7d1f793d96a7bc0d5af4db5c4c227219c4790fe6a9bd67241b8a44652c
+EBUILD quarter-1.0.0-r1.ebuild 1010 SHA256 0253ccf83773eb6ac25bd53c1e73e565fa1ffce2b12a586627fc8338cc1c4d29 SHA512 dac2ab9f53a5d559c40010f5a565dbda434486c579dd08753323f0fa30c02a951506e7b1cfa7cd24059bf353265fb6ece7d6d1991a55c8c5c863e757550caf16 WHIRLPOOL 54d4fb9b3c1dad7f2578e707f6ddfb2a20df0325b4e8c9a7ebfd6b12050a35277ceeb7600db1a8fc33ecb8d84e7f976bc417124f5adf58f488258fac96712452
+MISC ChangeLog 1274 SHA256 da0bca24104b4ade77754f44a801077977a29cbaa0c432852f7ff0ebd621535c SHA512 90417855e04e131560ad884ee0f345d5de409596979d7fd38bd3568722fa7e4350390cfe409566a0dfd8593f66b265000826ef2eb0c15540dca6f657fbc81c35 WHIRLPOOL 577852b19b2665c099a000c02c16c566e7598105705c5110c4c2ab6af4d5fe20be72b71e6ad1d937519c4575bd4bf9f41bf12f94c734e8cb7d2c2bc5cddc29fe
 MISC metadata.xml 233 SHA256 7f3ba949b1dfdfb44245acc1cc1f6fdd18a1a5fab3f49947f7054d2487a9ab75 SHA512 d2e05d36e47d90f9013f0f98e9c67daa527943820f8ac4a435a34f66de116990c7f5685a4102f8eb1c8a0ab70e76a3eecaeb7c36a9172160a8e7f9c0e2010b15 WHIRLPOOL bd1f238155bf2644421e42741bae9812ccf0d9eb0c18b03799ad053b8a7ec9d5ab65f9483d29003c7ffcd97e60e399a9867989f3e75ef9a0f4fdc073839ca6d3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJRMnO8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun885MQQAM8hH0FzPAOuCypWl4uEFFnA
-vumF90Ndr5h0Xi0/MlAF7qizZ1p8GWvOfKbNhWtwrnWmWOnniYHkfZvJxl6frEcx
-Qa/yQlO4Tz5yOFqySFKNAabtxp9Pp3KUnR0TktibTD5D4U/YbRoBT3JJfDwDJlPE
-ToqqKs1KKQAOBLKOT2QMynwdVxh3nT6yskshzovzKO2uyJZD6AQaVTuHvPlaYy9m
-A8ATIlYPSPWQozB63vebUGwnc2yHZtoZC76TgkXFKhqalfzrtEW4sDmbgAvZ2Kfz
-/f8qBS+0PoxyqDxuqM+1r+Qa8itbbNRagOD8GVZypuICO23nYc5eltVwhHeMkAHI
-hOUvw/fY/BB0ROW7zr33ZH3PX7sq49T9v2L+XdSKyoJLNNMWYplIaHim70zgJkSr
-WE9oeDA4R4wKKmbfhqYhIuB5ESKnQOXhQMjDuukZbH2uc6ZCBZ0VOTJ9z2haPSZN
-anqzAW22n4jqzQBmb/5wwWEEhaP2leYAXPqpcksLCtv/qsQ9gatIbd+iDzpCdEuq
-nyoO18JGe0dR1v0f1+lWGlbXOd4kMQih+Sh+uIJulCE9mAhxPLfuOfw1x+8LOHKX
-hn+Mw6st5dTxI7vrGg81Ypgv1NMOqCIb3cnVwQLzWc0LIyfqe6OCWZg8XOblKHPY
-QszuNbwVmOkGbdce5liu
-=mBTE
+iEYEAREIAAYFAlPr/7cACgkQFuHa/bHpVduSFQCgk2DO1uwwPz+I6ERo3UqZ/4A0
+MQ0AoKHM6Omqzn6CrsCq01ATmeSDuYjH
+=KYQf
 -----END PGP SIGNATURE-----
diff --git a/media-libs/quarter/files/quarter-1.0.0-gcc44.patch b/media-libs/quarter/files/quarter-1.0.0-gcc44.patch
index 9c3a44c1b513..e0f422b4cd36 100644
--- a/media-libs/quarter/files/quarter-1.0.0-gcc44.patch
+++ b/media-libs/quarter/files/quarter-1.0.0-gcc44.patch
@@ -1,6 +1,6 @@
-diff -ru ../Quarter-1.0.0/src/Quarter/Quarter.cpp ./src/Quarter/Quarter.cpp
---- ../Quarter-1.0.0/src/Quarter/Quarter.cpp	2009-01-26 22:47:07.000000000 +0100
-+++ ./src/Quarter/Quarter.cpp	2010-05-18 16:17:25.246880238 +0200
+diff -ruN Quarter-1.0.0/src/Quarter/Quarter.cpp my/src/Quarter/Quarter.cpp
+--- Quarter-1.0.0/src/Quarter/Quarter.cpp	2009-01-26 22:47:07.000000000 +0100
++++ my/src/Quarter/Quarter.cpp	2014-08-14 01:48:45.019728780 +0200
 @@ -123,6 +123,7 @@
    \subpage examiner
  */
diff --git a/media-libs/quarter/quarter-1.0.0-r1.ebuild b/media-libs/quarter/quarter-1.0.0-r1.ebuild
index d6d3ce6cf0f6..41f22741da5e 100644
--- a/media-libs/quarter/quarter-1.0.0-r1.ebuild
+++ b/media-libs/quarter/quarter-1.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/quarter-1.0.0-r1.ebuild,v 1.5 2013/03/02 21:48:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/quarter-1.0.0-r1.ebuild,v 1.6 2014/08/14 00:15:23 reavertm Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit base
+inherit autotools-utils
 
 MY_P="${P/q/Q}"
 
@@ -37,24 +37,13 @@ PATCHES=(
 DOCS=(AUTHORS NEWS README)
 
 src_configure() {
-	# Bug 336008
-	MAKEOPTS=-j1
-
-	econf \
-		htmldir="${ROOT}usr/share/doc/${PF}/html" \
-		--enable-pkgconfig \
-		--enable-shared \
-		--with-coin \
-		$(use_enable debug) \
-		$(use_enable debug symbols) \
-		$(use_enable doc html) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	base_src_install
-
-	# Do not install .la files
-	rm -f "${D}"/usr/lib*/qt4/plugins/designer/*.{la,a}
-	use static-libs || rm -f "${D}"/usr/lib*/*.la
+	local myeconfargs=(
+		htmldir="${ROOT}usr/share/doc/${PF}/html"
+		--enable-pkgconfig
+		--with-coin
+		$(use_enable debug)
+		$(use_enable debug symbols)
+		$(use_enable doc html)
+	)
+	autotools-utils_src_configure
 }