Version bump. Updated documentation & support for devhelp.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

3 files changed, 42 insertions, 30 deletions

diff --git a/dev-libs/libsigc++/ChangeLog b/dev-libs/libsigc++/ChangeLog
index f860e9c5b403..5225a03b62af 100644
--- a/dev-libs/libsigc++/ChangeLog
+++ b/dev-libs/libsigc++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libsigc++
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.143 2009/02/27 14:32:32 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.144 2009/09/14 21:13:39 eva Exp $
+
+*libsigc++-2.2.4.2 (14 Sep 2009)
+
+  14 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libsigc++-2.2.2.ebuild, +libsigc++-2.2.4.2.ebuild:
+  Version bump. Updated documentation & support for devhelp.
 
   27 Feb 2009; Brent Baude <ranger@gentoo.org> libsigc++-2.2.3.ebuild:
   stable ppc64, bug 255844
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 76c14858d775..ca248d8369ba 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,13 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gcc-3.4.patch 692 RMD160 1ab3afbef9bef922977c8eba1c0401750113826b SHA1 ea6c817331381f199f7167d8516064adea3185fb SHA256 2d9e971ef9399467325933206e292ed25a6eedd513e436a3a4dd7d3b267d5007
 AUX libsigc++-1.0.4-gcc43.patch 238 RMD160 402e21ca3165abb699c758f9295ef6aaef06ba91 SHA1 ba8d98b9f01ea4f713346797cb5eb443d93d525c SHA256 2c6f1953869947f88044eb76a19c6f7c6ba595bdbf9a0ee7b6d074f6e1b4532c
 AUX sandbox.patch 2164 RMD160 793242bb26295bb56d27cee3dce79b43e4957955 SHA1 0fd3f293c91465dd3bdd5d26b7a6ee3bb21a8f41 SHA256 6ff6598a0a1edd88f8ce0848bd44583b0c1b13044793bf84e5dbe75bda2a31ec
 DIST libsigc++-1.0.4.tar.gz 212089 RMD160 b750a5b6cd75fbb7288c6e35d8f3abad9f641722 SHA1 15a687edc5f64a317ef40f4df04dc5adeccfb88d SHA256 4b808da7f652ee4965295b92085e1da29a59eef24924aac10c1d8fc37b8fd9b3
 DIST libsigc++-1.2.7.tar.bz2 326205 RMD160 c6dbacce84ee6e8787291f6ccec1e4fa0ab73640 SHA1 63cefd4a33193b5c80a9d00b269fe9791539d67b SHA256 d9163d90e259bfde9164c7b218475a7664a7907a1b3197f17bc1035f36112225
-DIST libsigc++-2.2.2.tar.bz2 4502360 RMD160 b4f62cb4ee3edaca1f4f7a1fe929b93fba7b39de SHA1 e1d6446222410bf8d707c6d371101a6eb36e9121 SHA256 3df7d2750fd579d0776130eb4cf117c4a584677123d1447c0758a0f0a750e2a2
 DIST libsigc++-2.2.3.tar.bz2 4507948 RMD160 5da0da1dcae0e3d5805f7a3b9b1b03c348d603a4 SHA1 d67d94fad41e2907955ee138d634a193558c55d1 SHA256 53d9eb0d0f20acd423ac6b9ebda2012f4970e8c8c11e6671b1e2ae4a063a5042
+DIST libsigc++-2.2.4.2.tar.bz2 3596750 RMD160 128deb596e4f1d3e20d4ae9afa5ec03512fdf8d8 SHA1 1c8bbe6ff23d551fa198e634bba3b386240110b7 SHA256 998e4af392090a0db15102ba0f753fc6fc636574956c8292eb615a2a7823e201
 EBUILD libsigc++-1.0.4-r3.ebuild 1294 RMD160 5d67c22c14003343559f1deb0bc5aa9b31cd177d SHA1 21acfb8c77621134d8200d9b3c8fb32ba5f323c2 SHA256 5e69fb545f2c724925b8f2bcbb91b92d8dcc7d796762e696a42b81fa6d2db730
 EBUILD libsigc++-1.2.7.ebuild 915 RMD160 79de393ec2074ee3253b22c4b4fc9c3166fbf6c5 SHA1 651d60901ff50226f47d69db28cebbc40063c3f9 SHA256 ef46236a95fad45a40090af4f1bf6f3319dcd0ca9dfa9e32182af16f55a69910
-EBUILD libsigc++-2.2.2.ebuild 1745 RMD160 6e623189ca26dab1d24cfd99c45087e9d62e4ed2 SHA1 708a0cfc7ad841b6ead08b5852b3d0b6aeae71d9 SHA256 a08326db48bd7c0263a5ecae4cf88a700f7126336888b1d797532225f1d66693
 EBUILD libsigc++-2.2.3.ebuild 1745 RMD160 24d613f60a9607f37137c44fdda5bac2c80ccf14 SHA1 005fc07e31a43f398d5f65209a0fdbd07cef6d83 SHA256 74831c8b79e6a4b7dff43553e394ac34ed9616e8208afd6173a2923125372a85
-MISC ChangeLog 17125 RMD160 4e82369e246ce9454134a5f71d437b3aa7df192e SHA1 f7b04ff89c4f894cb601552ea5f2759a3432fcfc SHA256 b8ba14dfa840b011080ed380a5d162be9b9bd6093c2cf9141f2dce4239f8e5b5
+EBUILD libsigc++-2.2.4.2.ebuild 1745 RMD160 c44be23c3ac1b8c3da71825b6fad56e8a23f6603 SHA1 c6672c9f70b9d411263d62d1a9e32f3f9ceb9d79 SHA256 9a4b649022ce99772ba7be6ca2f08608c6df9ebc1f76ba483662d60e14e5fa36
+MISC ChangeLog 17326 RMD160 69f732ad5e8416334ec1518e3f27d592e1831aa0 SHA1 7f744f9ca4e18d5da36638ace2de9c9efec1c955 SHA256 479cb78a8f9e53b4bbc1bbf4759081bd1022df3cbdd48134dfef7ed662396e4f
 MISC metadata.xml 162 RMD160 e3b9e3d8ece920d890bf37c43a6bcd9757539556 SHA1 6ee3bb3e0cce43428124dfa192af30ddb055d95f SHA256 7d0ce82d5ca3b20cb1c4641c7b7aae7082fd6be059b85fab9699095fd965f2e9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqusgkACgkQ1fmVwcYIWAYZLwCgi5F5MTxQPNdkn274L9qeskjl
+RUgAn34K0gGJCLNjb3FoRUqfhBkGUvEg
+=KrQT
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libsigc++/libsigc++-2.2.2.ebuild b/dev-libs/libsigc++/libsigc++-2.2.4.2.ebuild
index 1baab0bfafc8..86e74e4c8a97 100644
--- a/dev-libs/libsigc++/libsigc++-2.2.2.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.2.4.2.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.2.2.ebuild,v 1.7 2008/12/07 12:05:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.2.4.2.ebuild,v 1.1 2009/09/14 21:13:39 eva Exp $
 
-inherit eutils gnome.org flag-o-matic
+EAPI="2"
+
+inherit base eutils gnome.org flag-o-matic
 
 DESCRIPTION="Typesafe callback system for standard C++"
 HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc test"
 
-	# don't waste time building examples/docs
-	sed -i 's|^\(SUBDIRS =.*\)docs examples\(.*\)$|\1\2|' Makefile.in || \
-		die "sed docs/examples failed"
+# Needs mm-common for eautoreconf
+src_prepare() {
+	# don't waste time building examples
+	sed -i 's|^\(SUBDIRS =.*\)examples\(.*\)$|\1\2|' Makefile.in || \
+		die "sed examples failed"
 
 	# don't waste time building tests unless USE=test
 	if ! use test ; then
@@ -27,31 +27,27 @@ src_unpack() {
 	fi
 
 	# fix image paths
-	if use doc ; then
-		sed -i 's|../../images/||g' docs/reference/html/*.html || \
-			die "sed failed"
-	fi
+#	if use doc ; then
+#		sed -i 's|../../images/||g' docs/reference/html/*.html || \
+#			die "sed failed"
+#	fi
 }
 
 src_compile() {
 	filter-flags -fno-exceptions
 
-	local myconf
-	use debug \
-		&& myconf="--enable-debug=yes" \
-		|| myconf="--enable-debug=no"
+	local myconf="$myconf $(use_enable doc documentation)"
 
 	econf ${myconf} || die "econf failed."
-	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed."
-	rm -fr "${D}"/usr/share
-	dodoc AUTHORS ChangeLog README NEWS TODO
+	emake DESTDIR="${D}" install || die "make install failed."
+	#rm -fr "${D}"/usr/share
+	dodoc AUTHORS ChangeLog README NEWS TODO || die "dodoc failed"
 
 	if use doc ; then
-		dohtml -r docs/reference/html/* docs/images/*
+		dohtml -r docs/reference/html/* docs/images/* || die "dohtml failed"
 		cp -R examples "${D}"/usr/share/doc/${PF}/
 	fi
 }