Fix examples installation (bug #366691 by Erik Zeek). Remove old.

Package-Manager: portage-2.1.9.47/cvs/Linux x86_64

4 files changed, 12 insertions, 82 deletions

diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index 81ac59c0ebca..02433acf240e 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.164 2011/05/09 11:35:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.165 2011/05/12 19:03:35 pacho Exp $
+
+  12 May 2011; Pacho Ramos <pacho@gentoo.org> -glibmm-2.28.0.ebuild,
+  glibmm-2.28.1.ebuild:
+  Fix examples installation (bug #366691 by Erik Zeek). Remove old.
 
 *glibmm-2.28.1 (09 May 2011)
 
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 395959ff8b39..f95ab0d6ecdb 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST glibmm-2.24.2.tar.bz2 4481414 RMD160 08ff9bb4a9b9e4e90f9fad74d553f37a4f805c0b SHA1 df5f22d2c40ebdf097ecdb4a7dfeef70d1ca24e7 SHA256 d4687c0b27f9c9f955a5306649008a1f8d8935edff916278fb7b65b44292ff7a
-DIST glibmm-2.28.0.tar.bz2 5656403 RMD160 8f78e000a90524b5f5e5ae8e32aa88c15ea064cd SHA1 ba9b40224a6543911ffbfd7268aa9a9172613a73 SHA256 b1b99868896b028354141e3b2470d98799283e90154550e12614f692db17a5a3
 DIST glibmm-2.28.1.tar.bz2 5632975 RMD160 2920ab2d88d57ed5b19fdc71ab8d75f58b0e919c SHA1 76cfba52d8fb1e3f46d14c3fea31269deb49e2fc SHA256 ca74638b91296df127caab30f2d0664746bfefa942ce5a5ecc982e0f16edc145
 EBUILD glibmm-2.24.2-r1.ebuild 1573 RMD160 8c23f01e75e95dc1cbe9cf27052f3f805454588c SHA1 691fc0c8a54d180ded5efe66e2f746c0f79c492d SHA256 abd3dfa10cd5d28466fa43e32f9329d1a408ca7fa97e17cfbff7663dbcfb42ed
-EBUILD glibmm-2.28.0.ebuild 1714 RMD160 a4cb41c03e3cd0ef477739916efd0d9eebdc24d1 SHA1 f4ce78ee33e7a1005e3a202ffca5de6e760b858b SHA256 1bf1d620977abb545b6edb44d003741b8b8406561ebb01d8c384e8c18bfeefb4
-EBUILD glibmm-2.28.1.ebuild 1625 RMD160 4f8843166b847c9fd4873d7462f73cd7907a17b5 SHA1 0bbd728d6c03491354718422cf1935b3de642f83 SHA256 e1e5dc370b897e69d93ab8ce3c2ce3c641a83b4c32751dcc71d097af7b5e2b37
-MISC ChangeLog 20148 RMD160 d7dc993bfdb9ed028f0acc59bab4a974a5e3f309 SHA1 55a935dd2d07c7a1db60a039eda5e415c70b37e3 SHA256 890282c84dc81d8d3545f6be06b436187dcf0398f3ad50448b139bcc030d0967
+EBUILD glibmm-2.28.1.ebuild 1628 RMD160 326db95b15944eef970c92aa79da4173d1d3d83e SHA1 fe3a393924163abfb6aa3c55bf2630f1e1342073 SHA256 b504bdf5757cecde04c7245c492a9140262ccf518c9df08ee4f1eb3de93dc861
+MISC ChangeLog 20310 RMD160 eb418da279d69d6ddcf03b724371198cf35763a4 SHA1 a36fac45917d45a4e2f16ef95fc3262dc4640d5d SHA256 dd105cac99b04809081f678d53671363cfdcdc5cbf73e83d6c59184ef6aacbb5
 MISC metadata.xml 162 RMD160 e3b9e3d8ece920d890bf37c43a6bcd9757539556 SHA1 6ee3bb3e0cce43428124dfa192af30ddb055d95f SHA256 7d0ce82d5ca3b20cb1c4641c7b7aae7082fd6be059b85fab9699095fd965f2e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3H0ZkACgkQCaWpQKGI+9Sr9ACdGXXP1mBDrO3/WTs0mrmHH2Ek
-xQEAnjcxpxlrjBOW/9O9gTf+j9LbIW30
-=k9EO
+iEYEARECAAYFAk3MLw4ACgkQCaWpQKGI+9RONACfYTu1700ETqbLpcOvKBLv1+oY
+5OgAnjeZmd/ud3MgcqjhuLnpK9Mm1amh
+=mozm
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/glibmm/glibmm-2.28.0.ebuild b/dev-cpp/glibmm/glibmm-2.28.0.ebuild
deleted file mode 100644
index 90307ca00f8e..000000000000
--- a/dev-cpp/glibmm/glibmm-2.28.0.ebuild
+++ /dev/null
@@ -1,72 +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.28.0.ebuild,v 1.2 2011/04/09 07:04:33 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-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 debug examples test"
-
-RDEPEND=">=dev-libs/libsigc++-2.2:2
-	>=dev-libs/glib-2.28:2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable debug debug-refcounting)
-		$(use_enable doc documentation)
-		--disable-schemas-compile
-		--enable-deprecated-api"
-}
-
-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
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-cpp/glibmm/glibmm-2.28.1.ebuild b/dev-cpp/glibmm/glibmm-2.28.1.ebuild
index f747f88981e6..a10b5b2e94fa 100644
--- a/dev-cpp/glibmm/glibmm-2.28.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.28.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2011/05/09 11:35:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.28.1.ebuild,v 1.2 2011/05/12 19:03:35 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -65,6 +65,6 @@ src_install() {
 
 	if use examples; then
 		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-		dodoc examples
+		dodoc -r examples
 	fi
 }