Version bump for Gnome 3.14. Clean up old revisions.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 13 insertions, 78 deletions

diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index cbabe8b1df2e..b3d95fce61f4 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/glibmm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.228 2014/10/11 11:35:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.229 2014/12/21 12:18:54 eva Exp $
+
+*glibmm-2.42.0 (21 Dec 2014)
+
+  21 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> -glibmm-2.38.1.ebuild,
+  -glibmm-2.38.2.ebuild, +glibmm-2.42.0.ebuild:
+  Version bump for Gnome 3.14. Clean up old revisions.
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> glibmm-2.40.0.ebuild:
   arm stable, bug #512012
diff --git a/dev-cpp/glibmm/glibmm-2.38.1.ebuild b/dev-cpp/glibmm/glibmm-2.38.1.ebuild
deleted file mode 100644
index 6a6dafe546f7..000000000000
--- a/dev-cpp/glibmm/glibmm-2.38.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.38.1.ebuild,v 1.12 2014/04/21 10:28:36 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-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.10:2
-	>=dev-libs/glib-2.38.0:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-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
-
-	# Test fails with IPv6 but not v4, upstream bug #720073
-	sed -e 's:giomm_tls_client/test::' \
-		-i tests/Makefile.{am,in} || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-src_test() {
-	cd "${S}/tests/"
-	default
-
-	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 -r examples
-	fi
-}
diff --git a/dev-cpp/glibmm/glibmm-2.38.2.ebuild b/dev-cpp/glibmm/glibmm-2.42.0.ebuild
index d38bc8ac01ce..9940caedbe70 100644
--- a/dev-cpp/glibmm/glibmm-2.38.2.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.42.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.38.2.ebuild,v 1.1 2014/04/27 10:31:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.42.0.ebuild,v 1.1 2014/12/21 12:18:54 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -17,7 +17,7 @@ IUSE="doc debug examples test"
 
 RDEPEND="
 	>=dev-libs/libsigc++-2.2.10:2
-	>=dev-libs/glib-2.38.0:2
+	>=dev-libs/glib-2.42:2
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -38,6 +38,10 @@ src_prepare() {
 			-i Makefile.am Makefile.in || die "sed 2 failed"
 	fi
 
+	# Test fails with IPv6 but not v4, upstream bug #720073
+	sed -e 's:giomm_tls_client/test::' \
+		-i tests/Makefile.{am,in} || die
+
 	gnome2_src_prepare
 }