Enable X USE flag by default, bug #422803 by Diego Elio Pettenò. Drop old.

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

6 files changed, 19 insertions, 191 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index f5320439aac2..c8ddd48e9e03 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.228 2012/05/20 19:36:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.229 2012/07/08 11:40:40 pacho Exp $
+
+  08 Jul 2012; Pacho Ramos <pacho@gentoo.org> -gtkmm-2.22.0.ebuild,
+  -gtkmm-2.24.0.ebuild, -gtkmm-3.0.1.ebuild, gtkmm-3.4.0.ebuild:
+  Enable X USE flag by default, bug #422803 by Diego Elio Pettenò. Drop old.
 
   20 May 2012; Samuli Suominen <ssuominen@gentoo.org> gtkmm-3.2.0.ebuild:
   ppc stable wrt #407643
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 28b0c0646ac7..965c02902b4c 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,15 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtkmm-3.4.0-automagic-gdk-targets.patch 1326 SHA256 46d4f70f8cb1a3f9c2d501ead3eba460d51e98624d0da71234a9799dcf6582da SHA512 0eba1f04ab01001d3668363ad0a12f1bc8a3a69e0db637f09f535caa7a0dab8dae22ee9eaa7994087eeb2017783b706b135ddb97b6b40dac347318c347e30904 WHIRLPOOL 287f3738e568d8ae1fb99d2a2a36a1335a43c977afbce083c0f4b4bf4d50e9e27c21823a83c0e4cedfd02150abede539c428ea09850ff2764658d5ee356d5989
-DIST gtkmm-2.22.0.tar.bz2 11496369 SHA256 8478d80d8d4793c2e1c459a71bad6a767a43eaf2664da06a9bd65a2b98bb07b1 SHA512 75a30d9c0ab9bbfb41145ca08c3c65e479a5483ef3581865d4623585d24b9681d226850fc8d1267ad6c66489381f1024f6ab91f577fa26a96ade742e60bf5885 WHIRLPOOL 307a8ba159660d568bf04940677928c274219b50d816bbf4a842be85bd867706034dec526a6a7836f7d588185e35181ec3283496a81d3ddec6282bc4b0224c99
-DIST gtkmm-2.24.0.tar.bz2 15227037 SHA256 8cbae7254746bc7df7cce882d9b9a916c4e00dba7bdacd1c50b5d096a484cf56 SHA512 2cea062cb9ba4c1c86fb7e0dd3a411519ac22f1de6506d5e7bf239de92aec96ac663da3a1d101925688a825245e3fbaf867019e76d4adf6fabad249686749efc WHIRLPOOL 9cb28a85dfcfe2fcdd8190f1e258bbe21edabd0fc686a83c5c2125298a698ad35084d22b20fb60b300723e17d169442ab84f297beb2c0e066259cf7fa1e73e0d
 DIST gtkmm-2.24.2.tar.xz 10776640 SHA256 c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d SHA512 9f48138641815a40f9c22f6b8785cbcd9e92473c405577dcc6ae29559835d51a17d87fd75518d8043eeec8ce0f643aeb8cfcd68a6df382d0b392da33f6c6f8b7 WHIRLPOOL 2c0408f4b3f5f6296e23a8782a386b80dd70fcb1247309f700bd03c0468c1f9226b501793c4dbc13ba8304be5429d38c4dc4dd8b64cbfcc290f5c23bf3d814e7
-DIST gtkmm-3.0.1.tar.bz2 16486895 SHA256 fb2d982095919e58ab5757042bf72e2a6243e77825c8ae6f46c41ab66cb68498 SHA512 6ecfb6cb6545869c4c1f49181a00dedd22453ebf84e69f1f91ac6e0bc0251d1f292e142bcbdeb0cf1d44bf48aa23b9660cfdf8014e44efc24e909098c6b91a46 WHIRLPOOL 2f93e31d3502f5a9d34b1c9d6e1821886191c8b45d7ca5520e67a60153b846d07671c0d7227db549804673d61198692f21d270fabd01c7feca65c14164030390
 DIST gtkmm-3.2.0.tar.xz 8784844 SHA256 6195dac58454e287ae17d380c028827f0a49669a3b93f85e2d4f6eb9459674f2 SHA512 845437f06de0956a208cdf1ec0ee5a855220de4765154f78a35d00e38b6e88b9c671a617d786fbdc91e69c207a377a0b5e80808446233f75055b1da8e85c4aac WHIRLPOOL 489cd735fb9a522968e0f21bb86c0bf7d5f3ed237bfe9a291244c495794ca08ea3120a232365b4f58057e102bc6414e32b8a2b619a8b53189a609a34cc3e7508
 DIST gtkmm-3.4.0.tar.xz 9188956 SHA256 42ea4e9acdd37fc3fe7026f8249a5427927b51048adff827bc1312900d6b12e9 SHA512 f98264fe9b4bcd7d926f52408f4a51d7d3191668e95fb9f49c29f88f9a63ef5330ee4d14d021eb4351f3a69646019d9c0963e7065140c5b776e0a7abf9ac62d1 WHIRLPOOL 04ac7aa36198ef4a71b64bd1d750559c499c7970e2e1012a8bb05f7bff6e95f961fa44322904b31af5f17519319a4bf83f1ca302445b9c1cbd3026d73c1ee851
-EBUILD gtkmm-2.22.0.ebuild 1300 SHA256 0e6896f9c452c5ee63a06d4be803c1fa559cf73db81d99ee22999da399fc7527 SHA512 64183f5c2babde2eac3322b8a2e0ebc77b8512550b0e551f7c3ceebe824f685d318c0cee2885d26201503fd28ced32325abaf7b5e8dfd9b38f39d1edfaee25ef WHIRLPOOL 168239243d6bbc6e3628a7fcc6a699f0f32a1f78e6d5355b20f3002cdb8a12b6f5c03b361bd392bd1f1071112be902ee3d88502ce49b6e857b00465eddef95ab
-EBUILD gtkmm-2.24.0.ebuild 1620 SHA256 105ff68f77713ef7f8f24a26ae8d1762182979bf4451f87fbd29f6478ccfbf2a SHA512 c239dd4c7d58b247d82107de2097a913b32ab092837a970972aa6556d32f992c05b6150a4624370b65e00cdbe5f7016716f343a50df50fcaeddeb8f8ca7a4795 WHIRLPOOL 974281a51ac03be2e2ebbed152b0ca3ba3f789966e3ec7313e952d52e3d7864603a07d84ffa26ae3d9f53105de133a90ab5e51e77fdc34f0aa3948d176febedb
 EBUILD gtkmm-2.24.2.ebuild 1339 SHA256 b31186e28faeacc3dfebf24e54c9acca10b851e6f2bff52344fdc05b78fbed98 SHA512 b2ee20e427a376de5457a140fc8ff4e267ef403c2259746a76e48f1865d0cffb5f9b2ac8a472fa55c5d69e90aaa764daabd702f082c2a3899f53abd59093808b WHIRLPOOL f45fcec61e055220f88a9edb62c54d1d8b176f4b47456f0fb0d80e4a5f8ac15eed7e93f4114a743b9b9891dbebc52b9238c80899e0a4a2b336b3958e21fa6698
-EBUILD gtkmm-3.0.1.ebuild 1463 SHA256 2d937a4f057fe949797bd1547058cc039ec27bc46c2f37765c27e2344c6e5c21 SHA512 ad2914fc1700857ac9dd08479bc1cdf058074f94ce3787ff64e9d695caa80d49d5dca6d27367e956d78a4938f10e962375e8fbe25ad696eff50cf0c293c7436c WHIRLPOOL 50de27c5e53dfb22e8bc79d6c518d5083207af9dad0eda469be52d9270e4c4264908b4c8ddec24ff0425e6f9c7a3fe98048bf7b1e89e015b4b6b3d9fc152a4f0
 EBUILD gtkmm-3.2.0.ebuild 1455 SHA256 86220496cd6e45b93f41c455f27ce7706764edfe9a4c98d5162ec1f66fc7a5ac SHA512 4913a18c32c5c4f96425a3480ff93f03fc8e40b1553cb0e45bc9bb97d9571a1986612af9471befec4c8d62f18e7fbc8f4161ffd8c38d38c08e829d24bbb0a3ea WHIRLPOOL 38800020aa75dfad47d1a7581d442c67effaebb9f6242b2d2a7a00d50a40a45d5621a1419e3c267e741f9ad4dc73c8c7de247210afc59ec0dfaade3476024685
-EBUILD gtkmm-3.4.0.ebuild 1767 SHA256 3594c555e350ad229482b6c36246ee330f575e6419abc86a10bb2b7d5ace453d SHA512 f779ccd23ee66f71b07eedb6ddb613c1662a14d7717bd40df0d3324debe91f8e4f30216752018edef14e8da386a29a6cc98541027ee525180615089cae618008 WHIRLPOOL ff4ae686cda6ba023047798aec842425330171f9a5d0b16d5cda75f1e3e5ea2996946d911a54150625ed12927c25139659454421d00ae5cd6eb10cbd40939ae1
-MISC ChangeLog 30679 SHA256 94577e897ce11a9157ff9ad357b6b3c28c57426392c256bdafbc3ba018452f7c SHA512 6610d9d342c80bd8de77bb7ef4de84d207b7b0a8f9456f8d247bfdd0172ae98007b6bdad4375cb8eb78405adae2a9bb0dbe4a611aa966fa9d6c6c4e2b9035baf WHIRLPOOL 87f4e20f6747f5c9945be75ea2345a6428bd7e494b8ab292680c16b9abe7c7a1ac12f0e96a2b465d7d4da8484591f3f50b029e0bbfdfd7853dd1ccc756702162
+EBUILD gtkmm-3.4.0.ebuild 1767 SHA256 8e349becc1642d3c254aa18d6e262144363d2c07058e2908a79ef235af3447a4 SHA512 ec51694cf9a66e62cd2751c4f25fc67c640f12857350dcd7b05dcee695bde1b6ae3387ffb7e550ad302572e8470427832b8a258ec84dc947043a43996ed701d6 WHIRLPOOL 42b34bd1ff5b0d15bd8bcaf1aa259df5024c227d32c5be0d9cdc237a952bbe9050776d5329f0b35e47d3104789c9f98f644a49a39a77ed4d1cafab04f08c7f07
+MISC ChangeLog 30887 SHA256 51d9be95107a4cfa4e84fa6f44874626af6ec0c36459d6ec142d98b98c3930f8 SHA512 216362abe4e7c8080b2a63421660e589836614d1ffca71c0cc752a3064ac67590a21c0337578c8bfbe4c6314b1968e01f14bd51853893cb84999a3fe032222d5 WHIRLPOOL 019b2d3bf1c47a33c700f8f9d5a91b87292911655a9e2ea1e7b3e8f5f0c41592818391fd908a4f5bf70616d53655f1488b9ac59d0fd4bf3a5da28c3703ccba45
 MISC metadata.xml 246 SHA256 fe6d8444fcb842c4843e1c1150ed2257e863542cc68527414d0360bfd20fb057 SHA512 2d192017565e8aac74538443a0ccffb81406fe4afe6595a02a812db982ebba7bc5904b02b866334c3c2a23e6a50ea4591b3ceaf7bc1a8282886126ffc2a841b1 WHIRLPOOL 3ec9b968366ec09f388a3a8c1543e3ed868dc646deb6cb528562692184255873ad16a99fbaba3c974fea45e3b94b95d3bdc2e8466416c94f191f4d3ff7a3ec96
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk/5cb4ACgkQCaWpQKGI+9QYfQCfbEhEzwO7QcPSKo5Kn9YeeHqQ
+HksAn277jET18ElCQHnKZE1dGu8YONzA
+=S+Ik
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtkmm/gtkmm-2.22.0.ebuild b/dev-cpp/gtkmm/gtkmm-2.22.0.ebuild
deleted file mode 100644
index 806a84f96e65..000000000000
--- a/dev-cpp/gtkmm/gtkmm-2.22.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.22.0.ebuild,v 1.10 2012/05/04 03:44:57 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for GTK+2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="2.4"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-cpp/glibmm-2.24:2
-	>=x11-libs/gtk+-2.22:2
-	>=dev-cpp/atkmm-2.22
-	>=dev-cpp/cairomm-1.2.2
-	>=dev-cpp/pangomm-2.26:1.4
-	dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
-	G2CONF="${G2CONF}
-		--enable-api-atkmm
-		--disable-maintainer-mode
-		$(use_enable doc documentation)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 1 failed"
-	fi
-
-	if ! use examples; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 2 failed"
-	fi
-}
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.0.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.0.ebuild
deleted file mode 100644
index 1113e1fa8f60..000000000000
--- a/dev-cpp/gtkmm/gtkmm-2.24.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.24.0.ebuild,v 1.10 2012/05/04 03:44:57 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2 autotools
-
-DESCRIPTION="C++ interface for GTK+2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="2.4"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-cpp/glibmm-2.24:2
-	>=x11-libs/gtk+-2.24:2
-	>=dev-cpp/atkmm-2.22.2
-	>=dev-cpp/cairomm-1.2.2
-	>=dev-cpp/pangomm-2.27.1:1.4
-	dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=dev-cpp/mm-common-0.9.3
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
-	G2CONF="${G2CONF}
-		--enable-api-atkmm
-		--disable-maintainer-mode
-		$(use_enable doc documentation)"
-
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 1 failed"
-	fi
-
-	if ! use examples; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 2 failed"
-	fi
-
-	if use doc; then
-		# Needed till upstream re-generates the tarball with mm-common-0.9.3
-		# glibmm no longer ships doc-install.pl, and the macro changed
-		mm-common-prepare --copy --force
-		eautoreconf
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-cpp/gtkmm/gtkmm-3.0.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.0.1.ebuild
deleted file mode 100644
index 38e011d7d349..000000000000
--- a/dev-cpp/gtkmm/gtkmm-3.0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.0.1.ebuild,v 1.2 2012/05/04 03:44:57 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for GTK+2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.27.93:2
-	>=x11-libs/gtk+-3.0.0:3
-	>=x11-libs/gdk-pixbuf-2.22.1:2
-	>=dev-cpp/atkmm-2.22.2
-	>=dev-cpp/cairomm-1.9.2.2
-	>=dev-cpp/pangomm-2.27.1:1.4
-	dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
-	G2CONF="${G2CONF}
-		--enable-api-atkmm
-		--disable-maintainer-mode
-		$(use_enable doc documentation)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 1 failed"
-	fi
-
-	if ! use examples; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 2 failed"
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild
index 820860e732d2..7f7e58680672 100644
--- a/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild,v 1.2 2012/05/04 03:44:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild,v 1.3 2012/07/08 11:40:40 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtkmm.org"
 LICENSE="LGPL-2.1"
 SLOT="3.0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="aqua doc examples test wayland X"
+IUSE="aqua doc examples test wayland +X"
 REQUIRED_USE="|| ( aqua wayland X )"
 
 RDEPEND="