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)

1 files changed, 26 insertions, 18 deletions

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"
 }