Bump eapi, drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 27 insertions, 80 deletions

diff --git a/x11-libs/libwnck/ChangeLog b/x11-libs/libwnck/ChangeLog
index 818bc60b22b7..e91aa0f0fa47 100644
--- a/x11-libs/libwnck/ChangeLog
+++ b/x11-libs/libwnck/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libwnck
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.346 2015/06/07 10:46:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.347 2015/06/20 11:27:21 pacho Exp $
+
+  20 Jun 2015; Pacho Ramos <pacho@gentoo.org> -libwnck-3.4.7.ebuild,
+  libwnck-2.31.0.ebuild:
+  Bump eapi, drop old
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> libwnck-3.14.0.ebuild:
   arm stable, bug #534012
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index e4700ff30fed..6c1396a95c16 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -3,18 +3,16 @@ Hash: SHA256
 
 DIST libwnck-2.31.0.tar.xz 630792 SHA256 83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9 WHIRLPOOL 369c0ce1f412a0874d2f3a09e387405632726259427fff013adc4d619f4f9f80b57e376252746bdc7fe54f27749e51127ccc0870a80629cb98afb45dc420f941
 DIST libwnck-3.14.0.tar.xz 675916 SHA256 f5080076346609b4c36394b879f3a86b92ced3b90a37cb54c8e9a14f00e7921c SHA512 bf5953d06697b6f623f82fe3ab3158ad3a794712bf08822fe901023e740afe4b47cc026854707b77c0c63d38614133fbef589d62385a39b99ce7e8c66c8940be WHIRLPOOL 945127110134e3b23f986fb3024b6a77577f42f9067e5760663849351687969398da0e69dca29f2e0950c8f5f364eb9e822c25d719c2f976fbf36f2e13c89d5c
-DIST libwnck-3.4.7.tar.xz 663768 SHA256 d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723 SHA512 50bf4d91f0e97bc70b08dfa5ebd43113e1f921981178c2c034021a93f6c6fcd86543069ef9ee1526b8e63dda93c185c386d20045d8b3ea1896fc8068b8c2d8ed WHIRLPOOL 887715194d6c8ef9d6dd80933eb08ddfc1d6f4cbd1184744a75e6b1c367d1515a0e28fb0b0f82695322eae645ff68189f7f67b4e4379f43242ee8df8971271fe
 DIST libwnck-3.4.9.tar.xz 674396 SHA256 96e6353f2701a1ea565ece54d791a7bebef1832d96126f7377c54bb3516682c4 SHA512 58397ab9c3ea8517503cbc51c5e72ffadfba882146936855a65756ada28339303408df17517cd6711f26bca6236e66a8755177849af28292fcc4820ce64d28b2 WHIRLPOOL 93366bbcbc45a17aff607c7db9d7d057013671f34762248388b343975c932ca174b0d471fab23b93f1d05e5064f9945a9734dceb88f0cf90cfdeab916e0e0e1f
-EBUILD libwnck-2.31.0.ebuild 1549 SHA256 ac0ceef0f35261e2e97f4713aab3fccf40b20d19e160f198831410f5c5be5d53 SHA512 06a58a0ced84057e935423182614629fd4b74da4d97553863256c9e7d1fe19d840777b2f87aff6cd6ab9c06613f05fd1428f005cebb8ea3d29a7205508aa5a23 WHIRLPOOL 57b3d5da092134c388aaefc5a6f838512d26ce9e9e1acc1dbca26801345a25290144ed2bb0d3b605bce3ed50ce435bf18a7fb18522e3a397fee15760352d2a11
+EBUILD libwnck-2.31.0.ebuild 1580 SHA256 e7fbc5a34a18a01e4a15b66074854e143f9967d24522de44a57a5675162bf9ce SHA512 fdb977e1bf45f497a567d744955f36a490257f5eb370c922769749ca504d7c360fef0e44b3e90d60e322d3ae1e3442c432ec288ef74ab3bc4d300745db6369a3 WHIRLPOOL 67a0e2bfd8109ae41bf3db19b3f9f13e1a73dfc281a18ac618d78ba14a29c30ade3371ca128bbd21b0e10ec5b6cd70b6a7bd89aa3b4688d9a7ab655556b44a2a
 EBUILD libwnck-3.14.0.ebuild 1535 SHA256 570b2bfc9a1327c3dae1b0604e0e81cf7032cccfb7f97384d1a64ca1d43499b4 SHA512 86adda8568dc9f43dd889cab9f405157d7037ae3d33a2979cfec378dac6323884ed818e331a33611ce611b9e613c487a6676c4805eb4fd217c3b434c406fe0ab WHIRLPOOL f097c373133e9b3da0f4b0fa97b7d0f840661fc6a313f5432b58d6f701124482878d9235961ab75a20f18f9a86338a463a7f7e5e2492b1547756f495a7a20a45
-EBUILD libwnck-3.4.7.ebuild 1671 SHA256 df4888c61c2109a0564e6df3f98991560d6958715a6cc473f285f214782e981e SHA512 bfc209dc6ef45755da5502ce46df1f9661b9a64e7711a46e7f43aa49b261618a415540e8c17468a3c77c6056d5f58e5567288fe5d3b11cc92d9247ae27e94bda WHIRLPOOL 82abc9d8f5ebea8ffaf3a6b7d6b1f897bc402624f85fc8fee698babc8db2625400bd9337b83ed610ccbc0af582a3559339b4cc686040c16efa52b3534744175b
 EBUILD libwnck-3.4.9.ebuild 1508 SHA256 80c31fd9553e830f5a7ac0d5b9193dba4ee0769980a04684a181f66710c9efe3 SHA512 efbfa6400005f1bda5be88edcf0ba26f7ba1972d5cb291e98cf8f94271ad3b9cd47a4c8f8741cfe83a4d8834bee777b29a5467d3696e40eb3c171a3c13dad4f2 WHIRLPOOL e2894133aa4917a64001274b242bae0391742edfd2a5b70f8bd8e1c0e30d21590fb736268338b9a06500d4985961b3db41e6ed3127b197a87ad50ff7af4fa5ef
-MISC ChangeLog 42124 SHA256 df10f9e8143fa9d4552e55820a25983e055227db21bde2f373aa1e067c8248cb SHA512 31407930d89424b63f9ed302094e8b393d27481564b626fc998e8ac070cb13e99611627b0e78d4affeea27218a5d4a3c822bf0424b6ee6876c5f68c9c409b194 WHIRLPOOL 9939e10f19da70066b28190bca938d19b0f8a0fc94cf1dd5249edb50bce5b5c6051fb87b74f507d6afa150011d46c5487f522ce8602b20277540546c15c03ebd
+MISC ChangeLog 42240 SHA256 186d0f8d4965fd65ca8a5efe7ce1c1af950373042857693dd8119edd43cc3b9a SHA512 43d0cbed409daaeb6daafc4aae58214836138c0368c77b89cd5bbf316b256d53b5ed23a5ee222bb3c145e253ad8e9a7cc62a6a83281b037b89f1e189b7170d7b WHIRLPOOL 371d02f32060e0ec56c1e262d8e32fc5dbf1e411c93cd10248a373f015f891c87913063067ea3c4ab5e27b260a0c0a7c41cd77d7489e097261fbd3e85f12371c
 MISC metadata.xml 270 SHA256 2ae55be45db83407f266aca79205d1602e012e91e325b9f33d7ba11c80aea16e SHA512 aef45e4937caeb214dc87a0189b6124af8c36faa26848ad5db01611cc9a5618b1aa157e0c204051cd3b3d3769f5b1e7515db50bae6e0f3722b4366335924cbad WHIRLPOOL 070ac03e8a8ff3ca430425cd57764cdecab3699db388218915c560abbc6e373ee4a0f06606f5c8b80b4b8b6dc6dc1bd2eb7422acfc0d54990f8eddad30d542ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV0IO4ACgkQkKaRLQcq0GIZUgCcCP02VXAyVAnI4i1D/4wP20dJ
-3GEAoK3QLCuVIWMF8bxCmh1zIcrIaFA2
-=uEEy
+iEYEAREIAAYFAlWFThoACgkQCaWpQKGI+9QPxACfeVqMGgdFXSUohAXc1kULCaOH
+FicAnREKDmblBsiZkNg2mvtdi1HXxexv
+=YGPk
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
index 7d0e7d486c00..016bd9f46d0f 100644
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.31.0.ebuild,v 1.12 2015/03/03 11:42:10 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.31.0.ebuild,v 1.13 2015/06/20 11:27:21 pacho Exp $
 
-EAPI="4"
+EAPI=5
 GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="no"
 
@@ -15,29 +15,28 @@ LICENSE="LGPL-2+"
 SLOT="1"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
-IUSE="doc +introspection startup-notification"
+IUSE="+introspection startup-notification"
 
-RDEPEND=">=x11-libs/gtk+-2.19.7:2[introspection?]
+RDEPEND="
+	>=x11-libs/gtk+-2.19.7:2[introspection?]
 	>=dev-libs/glib-2.16:2
 	x11-libs/libX11
 	x11-libs/libXres
 	x11-libs/libXext
-	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
+	startup-notification? ( >=x11-libs/startup-notification-0.4 )
+"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
-	x86-interix? ( sys-libs/itx-bind )"
+	x86-interix? ( sys-libs/itx-bind )
+"
 # eautoreconf needs
 #	gnome-base/gnome-common
 
 src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)
-		$(use_enable startup-notification)"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 	# Regenerate pregenerated marshalers for <glib-2.31 compatibility
@@ -51,3 +50,10 @@ src_prepare() {
 		append-ldflags "-L${EPREFIX}/usr/lib/bind"
 	fi
 }
+
+src_configure () {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable startup-notification)
+}
diff --git a/x11-libs/libwnck/libwnck-3.4.7.ebuild b/x11-libs/libwnck/libwnck-3.4.7.ebuild
deleted file mode 100644
index c178c02577e1..000000000000
--- a/x11-libs/libwnck/libwnck-3.4.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-3.4.7.ebuild,v 1.11 2014/06/20 14:45:34 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="+introspection startup-notification tools"
-
-RDEPEND=">=x11-libs/gtk+-3.4:3[introspection?]
-	>=dev-libs/glib-2.32:2
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXext
-	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )
-	x86-interix? ( sys-libs/itx-bind )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	virtual/pkgconfig"
-# eautoreconf needs
-#	gnome-base/gnome-common
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	if use x86-interix; then
-		# activate the itx-bind package...
-		append-flags "-I${EPREFIX}/usr/include/bind"
-		append-ldflags "-L${EPREFIX}/usr/lib/bind"
-	fi
-
-	# Don't collide with SLOT=1
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable startup-notification) \
-		$(use_enable tools) \
-		--program-suffix=-${SLOT}
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use tools; then
-		elog "wnckprop is now called wnckprop-${SLOT}"
-		elog "wnck-urgency-monitor is now called wnck-urgency-monitor-${SLOT}"
-	fi
-}