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

(Portage version: 2.1.11.5/cvs/Linux x86_64)

5 files changed, 7 insertions, 183 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/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="