[gentoo-commits] gentoo-x86 commit in dev-cpp/libglademm: ChangeLog libglademm-2.6.4.ebuild libglademm-2.6.7.ebuild libglademm-2.2.0.ebuild libglademm-2.0.1.ebuild

[Gilles Dartiguelongue (eva)]

eva         10/04/03 11:26:26

  Modified:             ChangeLog libglademm-2.6.4.ebuild
                        libglademm-2.6.7.ebuild
  Removed:              libglademm-2.2.0.ebuild libglademm-2.0.1.ebuild
  Log:
  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)

Revision  Changes    Path
1.78                 dev-cpp/libglademm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/libglademm/ChangeLog?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/libglademm/ChangeLog?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/libglademm/ChangeLog?r1=1.77&r2=1.78

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ChangeLog	17 Nov 2008 20:53:46 -0000	1.77
+++ ChangeLog	3 Apr 2010 11:26:26 -0000	1.78
@@ -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@g.o> -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@g.o>
   files/libglademm-2.2.0-configure.patch:



1.12                 dev-cpp/libglademm/libglademm-2.6.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.4.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.4.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.4.ebuild?r1=1.11&r2=1.12

Index: libglademm-2.6.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.4.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libglademm-2.6.4.ebuild	10 Jul 2008 15:20:06 -0000	1.11
+++ libglademm-2.6.4.ebuild	3 Apr 2010 11:26:26 -0000	1.12
@@ -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 @@
 
 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



1.2                  dev-cpp/libglademm/libglademm-2.6.7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7.ebuild?r1=1.1&r2=1.2

Index: libglademm-2.6.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libglademm-2.6.7.ebuild	17 Nov 2008 19:41:01 -0000	1.1
+++ libglademm-2.6.7.ebuild	3 Apr 2010 11:26:26 -0000	1.2
@@ -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 @@
 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 @@
 	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"
 }