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

(Portage version: 2.1.3.12)

4 files changed, 82 insertions, 5 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++/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."
+}