bump to 2.0.18 (for gnome 2.18.3) and fix a QA warning

Package-Manager: portage-2.1.3.12

5 files changed, 101 insertions, 16 deletions

diff --git a/dev-libs/libsigc++/ChangeLog b/dev-libs/libsigc++/ChangeLog
index 2aa061f0a144..7ced2be00407 100644
--- a/dev-libs/libsigc++/ChangeLog
+++ b/dev-libs/libsigc++/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/libsigc++
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.106 2007/09/27 22:32:42 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.107 2007/10/14 00:17:56 eva Exp $
+
+  14 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  libsigc++-1.0.4-r3.ebuild:
+  fix QA warnings
+
+*libsigc++-2.0.18 (14 Oct 2007)
+
+  14 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +libsigc++-2.0.18.ebuild:
+  bump to 2.0.18
 
   27 Sep 2007; Mart Raudsepp <leio@gentoo.org> -libsigc++-2.0.11.ebuild,
   -libsigc++-2.0.14.ebuild, -libsigc++-2.0.15.ebuild,
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 4d6adc8d8bf3..4e0adfa675d3 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -12,14 +12,15 @@ SHA256 6ff6598a0a1edd88f8ce0848bd44583b0c1b13044793bf84e5dbe75bda2a31ec files/sa
 DIST libsigc++-1.0.4.tar.gz 212089 RMD160 b750a5b6cd75fbb7288c6e35d8f3abad9f641722 SHA1 15a687edc5f64a317ef40f4df04dc5adeccfb88d SHA256 4b808da7f652ee4965295b92085e1da29a59eef24924aac10c1d8fc37b8fd9b3
 DIST libsigc++-1.2.5.tar.gz 408276 RMD160 36971e78f4d8dfa3453bea9a65b00cc1ba5dd2f5 SHA1 9acc3eb2eb2e1cebe6ef3251de4d621a4b728ea0 SHA256 dcd6d3ea9a2c185b5286f80eefe9ac1402036b8fa21cfc742442d99579bd2b3e
 DIST libsigc++-2.0.17.tar.bz2 1796600 RMD160 ebfe24bddcabe1af3fba9f2bb05f176687822d08 SHA1 5948b6830ee3ea5d550097b2879249382b6c729c SHA256 e604bf575704fba058d1f78c55bd1ec4253f957f72874ccae8416a5edc3c0cca
+DIST libsigc++-2.0.18.tar.bz2 1842485 RMD160 314e5fd243dbaf49974130bd9d2692766f0116f5 SHA1 75df46c977a3418bda4d5ae7e21c9ede28993835 SHA256 53e7d030b73815a31781c26acb42f7880df3e786ed46a8fe3cde08a4c21ecceb
 EBUILD libsigc++-1.0.4-r2.ebuild 1474 RMD160 788f9fe53b45f587edff9fb0141d71b696a4c966 SHA1 798fbe4dd6882d0c10b3a856dadf7ef9f801e04e SHA256 b56c2e274b19a3abf74a534931ca16ca62e595227ca09f079b33f082fbb5f605
 MD5 115b379ff91106ca3bd76a4bc3085f58 libsigc++-1.0.4-r2.ebuild 1474
 RMD160 788f9fe53b45f587edff9fb0141d71b696a4c966 libsigc++-1.0.4-r2.ebuild 1474
 SHA256 b56c2e274b19a3abf74a534931ca16ca62e595227ca09f079b33f082fbb5f605 libsigc++-1.0.4-r2.ebuild 1474
-EBUILD libsigc++-1.0.4-r3.ebuild 1066 RMD160 a75fb8f9d2533cd110a18916ae69813dca7dcc73 SHA1 5b5de7b6f224b99d24aa6945b260eaec1f0565fc SHA256 3a74d525077f696dbf34e13026c180b22d2121b0d82ad8a227e5e891887fe46a
-MD5 eabbfb93224026192fa11cb3cbdaaa34 libsigc++-1.0.4-r3.ebuild 1066
-RMD160 a75fb8f9d2533cd110a18916ae69813dca7dcc73 libsigc++-1.0.4-r3.ebuild 1066
-SHA256 3a74d525077f696dbf34e13026c180b22d2121b0d82ad8a227e5e891887fe46a libsigc++-1.0.4-r3.ebuild 1066
+EBUILD libsigc++-1.0.4-r3.ebuild 1088 RMD160 fd5b67356bbeb86ef2832645afaaff2d58b85538 SHA1 01cd85df59e4a0d4b57ebd6d347298692fbe2ced SHA256 22d084c47601eaf2799f49717c3bccf6bf7cf3146352a951afcdf90c5d3bf55c
+MD5 b8f390df59178481a44dfa6c4f1adea9 libsigc++-1.0.4-r3.ebuild 1088
+RMD160 fd5b67356bbeb86ef2832645afaaff2d58b85538 libsigc++-1.0.4-r3.ebuild 1088
+SHA256 22d084c47601eaf2799f49717c3bccf6bf7cf3146352a951afcdf90c5d3bf55c libsigc++-1.0.4-r3.ebuild 1088
 EBUILD libsigc++-1.2.5.ebuild 1225 RMD160 827e92dd16f36c175119f73bcb16fe3bd559c7ca SHA1 6865344d04c751279bbf1c8cf0224b55f7fa0187 SHA256 0ce809170a4c4d50ea968010205a4db756f8844ba7fa2a902809ef83744533f3
 MD5 50c4a118aa9eb17fdec4d74f5cf7247a libsigc++-1.2.5.ebuild 1225
 RMD160 827e92dd16f36c175119f73bcb16fe3bd559c7ca libsigc++-1.2.5.ebuild 1225
@@ -28,10 +29,14 @@ EBUILD libsigc++-2.0.17.ebuild 1743 RMD160 714ef9f4e3bc9390d2aac96ff682160e413f9
 MD5 82044500a7cc1b3e4431d804a7b83e3b libsigc++-2.0.17.ebuild 1743
 RMD160 714ef9f4e3bc9390d2aac96ff682160e413f9a53 libsigc++-2.0.17.ebuild 1743
 SHA256 22fb96dd3556d9f2af02ec52055dc47c6ce76278f84bc6a3842bb626d858d362 libsigc++-2.0.17.ebuild 1743
-MISC ChangeLog 12873 RMD160 f31b7ce5fc872ad1f15ec9ccb1cb5dfdbaabb3e8 SHA1 ef9d45b85a812e60c09047dd00db8d4fd440606d SHA256 41bd2e68d4301deaabf3e172145556685a76af0e15d9db42874acb1d801176f2
-MD5 32ed2c54360ab10ca0047b373b4fc45a ChangeLog 12873
-RMD160 f31b7ce5fc872ad1f15ec9ccb1cb5dfdbaabb3e8 ChangeLog 12873
-SHA256 41bd2e68d4301deaabf3e172145556685a76af0e15d9db42874acb1d801176f2 ChangeLog 12873
+EBUILD libsigc++-2.0.18.ebuild 1750 RMD160 59290a6a8b2595c8bae82c225fb326d77e6c61ba SHA1 d7c24dfd005197dd15794b3e449b67800cf569b7 SHA256 a94fc3566117e44722c98cbd1b1ca154932d7a3f48460fb2aa3d7a0145dfc4f9
+MD5 25add8ee9706fb2741585e9e8e6264dd libsigc++-2.0.18.ebuild 1750
+RMD160 59290a6a8b2595c8bae82c225fb326d77e6c61ba libsigc++-2.0.18.ebuild 1750
+SHA256 a94fc3566117e44722c98cbd1b1ca154932d7a3f48460fb2aa3d7a0145dfc4f9 libsigc++-2.0.18.ebuild 1750
+MISC ChangeLog 13107 RMD160 6e770ac92db48d7d6bd6d1eb8388efe8c45cf124 SHA1 5d37a11237cbf77ecb8f061498a1bbc61b0f0e54 SHA256 bbd33be559352ca4c84f50afe46b086b91d8a754489e00aeff1ce806bebb8354
+MD5 c7a097ffae7415d3e3649173de728f26 ChangeLog 13107
+RMD160 6e770ac92db48d7d6bd6d1eb8388efe8c45cf124 ChangeLog 13107
+SHA256 bbd33be559352ca4c84f50afe46b086b91d8a754489e00aeff1ce806bebb8354 ChangeLog 13107
 MISC metadata.xml 162 RMD160 e3b9e3d8ece920d890bf37c43a6bcd9757539556 SHA1 6ee3bb3e0cce43428124dfa192af30ddb055d95f SHA256 7d0ce82d5ca3b20cb1c4641c7b7aae7082fd6be059b85fab9699095fd965f2e9
 MD5 e1f2511030c19628dbfd68a7b1cd5c82 metadata.xml 162
 RMD160 e3b9e3d8ece920d890bf37c43a6bcd9757539556 metadata.xml 162
@@ -48,10 +53,13 @@ SHA256 6ca770fcc408a95fa864bbd435170ad754ddcc47c2ecffbe0a84840e5c30bad3 files/di
 MD5 228f5f6386a258693f255d346c3c5264 files/digest-libsigc++-2.0.17 256
 RMD160 fdc96486d181f07172697b85f2778121c367ca7a files/digest-libsigc++-2.0.17 256
 SHA256 f05c5ae0f0c23a83cb9af86d2957d30cc0f336153394fcd79b079c47c9375a1b files/digest-libsigc++-2.0.17 256
+MD5 576aa4799313c56fd068f9bd32540c84 files/digest-libsigc++-2.0.18 256
+RMD160 c589a5aee43a06a0656f7648b503da43975d52e1 files/digest-libsigc++-2.0.18 256
+SHA256 2ae3daf3780f7405b9eedffe5663df7d642eefbf53258b1dacba95524fef1a63 files/digest-libsigc++-2.0.18 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG/C9KkeYb6olFHJcRAr0RAJ4i/6SQr0OjuQKDzAqAi0mWg5rjcACePHlg
-dypHDuomQSeRuYwvJZBaWsU=
-=uaTk
+iD8DBQFHEWBA1fmVwcYIWAYRAuioAJ0bT8Tr26q7f8OKoL1skikB/AacVgCgpA4b
+aWypdWfARU/PdfsSM1euhfk=
+=lN9z
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libsigc++/files/digest-libsigc++-2.0.18 b/dev-libs/libsigc++/files/digest-libsigc++-2.0.18
new file mode 100644
index 000000000000..5eb3a8f88f12
--- /dev/null
+++ b/dev-libs/libsigc++/files/digest-libsigc++-2.0.18
@@ -0,0 +1,3 @@
+MD5 ddebf5aafc8525d10366a8724abc9f28 libsigc++-2.0.18.tar.bz2 1842485
+RMD160 314e5fd243dbaf49974130bd9d2692766f0116f5 libsigc++-2.0.18.tar.bz2 1842485
+SHA256 53e7d030b73815a31781c26acb42f7880df3e786ed46a8fe3cde08a4c21ecceb libsigc++-2.0.18.tar.bz2 1842485
diff --git a/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild b/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild
index b65bda0c1767..f3a5d1b38efe 100644
--- a/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild,v 1.8 2007/01/06 14:16:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild,v 1.9 2007/10/14 00:17:56 eva Exp $
 
 inherit eutils
 
@@ -19,11 +19,11 @@ src_compile() {
 	use debug \
 		&& myconf="--enable-debug=yes" \
 		|| myconf="--enable-debug=no"
-	econf ${myconf} || die
+	econf ${myconf} || die "econf failed"
 
-	epatch ${FILESDIR}/sandbox.patch || die
+	epatch "${FILESDIR}"/sandbox.patch
 
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/dev-libs/libsigc++/libsigc++-2.0.18.ebuild b/dev-libs/libsigc++/libsigc++-2.0.18.ebuild
new file mode 100644
index 000000000000..2d996ca06865
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-2.0.18.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.0.18.ebuild,v 1.1 2007/10/14 00:17:56 eva Exp $
+
+inherit 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}"
+
+	# don't waste time building examples/docs
+	sed -i 's|^\(SUBDIRS =.*\)docs examples\(.*\)$|\1\2|' Makefile.in || \
+		die "sed docs/examples failed"
+
+	# don't waste time building tests unless USE=test
+	if ! use test ; then
+		sed -i 's|^\(SUBDIRS =.*\)tests\(.*\)$|\1\2|' Makefile.in || \
+			die "sed tests failed"
+	fi
+
+	# fix image paths
+	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"
+
+	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
+
+	if use doc ; then
+		dohtml -r docs/reference/html/* docs/images/*
+		cp -R examples "${D}"/usr/share/doc/${PF}/
+	fi
+}
+
+pkg_postinst() {
+	ewarn "To allow parallel installation of sig++-1.0, sig++-1.2, and sig++2.0"
+	ewarn "the header files are now installed in a version specific"
+	ewarn "subdirectory.  Be sure to unmerge any libsig++ versions"
+	ewarn "< 1.0.4 that you may have previously installed."
+}