Kill slot 2 since it is unused. Clean up ebuild and bring it to EAPI=3.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

7 files changed, 37 insertions, 108 deletions

diff --git a/dev-cpp/libglademm/ChangeLog b/dev-cpp/libglademm/ChangeLog
index 0a235e5d5727..319fbcd31e95 100644
--- a/dev-cpp/libglademm/ChangeLog
+++ b/dev-cpp/libglademm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/libglademm
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/ChangeLog,v 1.77 2008/11/17 20:53:46 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/ChangeLog,v 1.78 2010/04/03 11:26:26 eva Exp $
+
+  03 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org> -files/gcc34.patch,
+  -libglademm-2.0.1.ebuild, -libglademm-2.2.0.ebuild,
+  -files/libglademm-2.2.0-configure.patch, libglademm-2.6.4.ebuild,
+  libglademm-2.6.7.ebuild:
+  Kill slot 2 since it is unused. Clean up ebuild and bring it to EAPI=3.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/libglademm-2.2.0-configure.patch:
diff --git a/dev-cpp/libglademm/files/gcc34.patch b/dev-cpp/libglademm/files/gcc34.patch
deleted file mode 100644
index f6143216f8dc..000000000000
--- a/dev-cpp/libglademm/files/gcc34.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN libglademm-2.4.0-old/examples/derived/deriveddialog.h libglademm-2.4.0-new/examples/derived/deriveddialog.h
---- libglademm-2.4.0/examples/derived/deriveddialog.h	2003-08-23 19:21:06.000000000 +0200
-+++ libglademm-2.4.0/examples/derived/deriveddialog.h	2004-05-22 14:11:18.354537344 +0200
-@@ -19,8 +19,8 @@
- #ifndef LIBGLADEMM_EXAMPLE_DERIVED_DIALOG_H
- #define LIBGLADEMM_EXAMPLE_DERIVED_DIALOG_H
- 
--#include <libglademm.h>
- #include <gtkmm.h>
-+#include <libglademm.h>
- 
- 
- class DerivedDialog : public Gtk::Dialog
diff --git a/dev-cpp/libglademm/files/libglademm-2.2.0-configure.patch b/dev-cpp/libglademm/files/libglademm-2.2.0-configure.patch
deleted file mode 100644
index 4e84ba83f6e4..000000000000
--- a/dev-cpp/libglademm/files/libglademm-2.2.0-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure	2004-03-29 12:22:40.000000000 -0500
-+++ b/configure	2004-11-01 20:00:49.914274904 -0500
-@@ -3634,7 +3634,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `"$LD" -v 2>&1 </dev/null` in
-+case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -9990,7 +9990,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `"$LD" -v 2>&1 </dev/null` in
-+case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
diff --git a/dev-cpp/libglademm/libglademm-2.0.1.ebuild b/dev-cpp/libglademm/libglademm-2.0.1.ebuild
deleted file mode 100644
index 8312aded5c37..000000000000
--- a/dev-cpp/libglademm/libglademm-2.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.0.1.ebuild,v 1.13 2008/07/10 15:20:06 remi Exp $
-
-inherit gnome2
-IUSE=""
-DESCRIPTION="C++ bindings for libglade"
-HOMEPAGE="http://www.gtkmm.org"
-SRC_URI="mirror://sourceforge/gtkmm/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 hppa ~ia64 ppc sparc x86"
-
-RDEPEND=">=gnome-base/libglade-2
-	=dev-cpp/gtkmm-2.2*"
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}"
-
-# Needed for 2.0.0, it misses some make/libtool magic
-export SED=sed
-
-DOCS="AUTHORS COPYING ChangeLog NEWS README TODO INSTALL"
diff --git a/dev-cpp/libglademm/libglademm-2.2.0.ebuild b/dev-cpp/libglademm/libglademm-2.2.0.ebuild
deleted file mode 100644
index db5ac2e77e57..000000000000
--- a/dev-cpp/libglademm/libglademm-2.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.2.0.ebuild,v 1.14 2008/07/10 15:20:06 remi Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="C++ bindings for libglade"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="-amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=gnome-base/libglade-2
-	=dev-cpp/gtkmm-2.2*"
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}"
-
-# Needed for 2.0.0, it misses some make/libtool magic
-# export SED=sed
-
-DOCS="AUTHORS COPYING ChangeLog NEWS README TODO INSTALL"
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/gcc34.patch
-	epatch "${FILESDIR}"/${P}-configure.patch
-}
diff --git a/dev-cpp/libglademm/libglademm-2.6.4.ebuild b/dev-cpp/libglademm/libglademm-2.6.4.ebuild
index 2b1a183f7f6b..d0d42499c8b9 100644
--- a/dev-cpp/libglademm/libglademm-2.6.4.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.4.ebuild,v 1.11 2008/07/10 15:20:06 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.4.ebuild,v 1.12 2010/04/03 11:26:26 eva Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="arm ppc64 sh"
 IUSE="doc examples"
 
 RDEPEND=">=gnome-base/libglade-2.6.1
diff --git a/dev-cpp/libglademm/libglademm-2.6.7.ebuild b/dev-cpp/libglademm/libglademm-2.6.7.ebuild
index 8123c98972ea..1ab83babb601 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7.ebuild,v 1.1 2008/11/17 19:41:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7.ebuild,v 1.2 2010/04/03 11:26:26 eva Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
 
 inherit gnome2
 
@@ -13,33 +16,31 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc examples"
 
 RDEPEND=">=gnome-base/libglade-2.6.1
-	>=dev-cpp/gtkmm-2.6"
+	>=dev-cpp/gtkmm-2.6
+	>=dev-cpp/glibmm-2.4"
 
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 
 	# we will control install manually in install
-	sed -i 's/^\(SUBDIRS =.*\)docs\(.*\)$/\1\2/' Makefile.in || \
-		die "sed Makefile.in failed"
+	sed -i 's/^\(SUBDIRS =.*\)docs\(.*\)$/\1\2/' Makefile.am Makefile.in || \
+		die "sed Makefile.{am,in} failed (1)"
 
-	if ! use examples; then
-		# don't waste time building the examples
-		sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
-			die "sed Makefile.in failed"
-	fi
+	# don't waste time building the examples
+	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+		Makefile.am Makefile.in || die "sed Makefile.{am,in} failed (2)"
 }
 
 src_compile() {
 	gnome2_src_compile
 
 	if use doc; then
-		cd "${S}/docs/reference"
-		make all
+		emake -C "${S}/docs/reference" all || die "emake doc failed"
 	fi
 }
 
@@ -47,10 +48,17 @@ src_install() {
 	gnome2_src_install
 
 	if use doc ; then
-		dohtml -r docs/reference/html/*
+		dohtml -r docs/reference/html/* || die "dohtml failed"
 	fi
 
 	if use examples; then
-		cp -R examples "${D}"/usr/share/doc/${PF}
+		emake -C "${S}/examples" distclean || die "examples clean up failed"
+		find "${S}/examples" -name "Makefile*" -delete \
+			|| "examples cleanup failed"
+		insinto "/usr/share/doc/${PF}"
+		doins -r examples || die "doins failed"
 	fi
+
+	# Does not install static library
+	find "${D}" -name "*.la" -delete || die "failed *.la removal"
 }