Version bump, remove old.

(Portage version: 2.1.10.36/cvs/Linux x86_64)

3 files changed, 12 insertions, 71 deletions

diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index 0b8259fb8b53..0fb3956d5558 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/glibmm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.175 2011/10/19 04:11:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.176 2011/11/20 15:45:42 pacho Exp $
+
+*glibmm-2.30.1 (20 Nov 2011)
+
+  20 Nov 2011; Pacho Ramos <pacho@gentoo.org> +glibmm-2.30.1.ebuild,
+  -glibmm-2.24.2-r1.ebuild, -glibmm-2.28.1.ebuild:
+  Version bump, remove old.
 
 *glibmm-2.30.0 (19 Oct 2011)
 
diff --git a/dev-cpp/glibmm/glibmm-2.24.2-r1.ebuild b/dev-cpp/glibmm/glibmm-2.24.2-r1.ebuild
deleted file mode 100644
index b34729082658..000000000000
--- a/dev-cpp/glibmm/glibmm-2.24.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.24.2-r1.ebuild,v 1.5 2011/01/04 18:10:11 armin76 Exp $
-
-EAPI="3"
-inherit gnome2
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="|| ( LGPL-2.1 GPL-2 )"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-libs/libsigc++-2.2
-	>=dev-libs/glib-2.24.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# We cannot set this just now as it causes breakage, bug #336928
-#pkg_setup() {
-#	G2CONF="${G2CONF} $(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 examples
-		sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 2 failed"
-	fi
-}
-
-src_test() {
-	cd "${S}/tests/"
-	emake check || die "emake check failed"
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use doc && ! use examples; then
-		rm -fr "${ED}usr/share/doc/glibmm*"
-	fi
-
-	if use examples; then
-		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-		dodoc examples
-	fi
-}
diff --git a/dev-cpp/glibmm/glibmm-2.28.1.ebuild b/dev-cpp/glibmm/glibmm-2.30.1.ebuild
index 8c2dd134d115..e43f8e9ca68d 100644
--- a/dev-cpp/glibmm/glibmm-2.28.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.30.1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.28.1.ebuild,v 1.3 2011/06/15 16:16:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.30.1.ebuild,v 1.1 2011/11/20 15:45:42 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2
 
@@ -14,14 +13,15 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug examples test"
 
-RDEPEND=">=dev-libs/libsigc++-2.2:2
-	>=dev-libs/glib-2.28:2"
+RDEPEND=">=dev-libs/libsigc++-2.2.10:2
+	>=dev-libs/glib-2.30.0:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
+# dev-cpp/mm-common needed for eautoreconf
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"