Version bump; 2.0.14 stable on x86,sparc. Tidy old ebuilds.

(Portage version: 2.0.51.22-r1)

11 files changed, 57 insertions, 99 deletions

diff --git a/dev-libs/libsigc++/ChangeLog b/dev-libs/libsigc++/ChangeLog
index 584133abe075..b135c8fa327f 100644
--- a/dev-libs/libsigc++/ChangeLog
+++ b/dev-libs/libsigc++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libsigc++
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.63 2005/07/07 00:30:38 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.64 2005/07/12 17:12:07 ka0ttic Exp $
+
+*libsigcc++-2.0.15 (12 Jul 2005)
+
+  12 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> -libsigc++-1.2.2.ebuild,
+  -libsigc++-1.2.3.ebuild, -libsigc++-2.0.12.ebuild, +libsigc++-2.0.15.ebuild,
+  libsigc++-2.0.14.ebuild, metadata.xml:
+  Version bump; 2.0.14 stable on x86,sparc. Tidy old ebuilds.
 
   07 Jul 2005; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
   libsigc++-2.0.14.ebuild:
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index c0b6a9d888bb..c6a8933f3e28 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,19 +1,15 @@
-MD5 e48c7bb1105948b286784f27e30fa66d libsigc++-1.2.3.ebuild 1041
-MD5 a72f8856aeffa92832ba7584bcb7e595 libsigc++-2.0.12.ebuild 1293
 MD5 6a5e7834acbb57c4d7b7263ce97d2e20 libsigc++-1.2.5.ebuild 1476
-MD5 d942dd50192798ca9b7cdfbdd332d269 libsigc++-2.0.14.ebuild 1829
-MD5 401a2c3b3020ab9d031f9ea40fe45045 libsigc++-1.2.2.ebuild 1042
+MD5 abbad8cd31c04d9e1d5b545ba519e67e libsigc++-2.0.14.ebuild 1827
 MD5 2dce41630775743cced6079f6629dfb8 libsigc++-2.0.11.ebuild 1287
-MD5 5c6b5f8bae0e2ca2c46ab2fc27d7f743 ChangeLog 7912
+MD5 3642f98fd630a98f8f8071444e76b564 ChangeLog 8203
 MD5 6b17a879fe86bc2b447e8d3c6489f0c6 libsigc++-2.0.5.ebuild 1446
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 09d3293038c3ef6ba2ff98ef6609680a metadata.xml 252
 MD5 09db05165ade799adc26846ff7c3eb5f libsigc++-1.0.4-r2.ebuild 1568
-MD5 1dafc199015856931c135a0a15a757c1 files/digest-libsigc++-1.2.2 67
-MD5 d022afc817cff89e7d0eec21e87613f3 files/digest-libsigc++-1.2.3 67
+MD5 d942dd50192798ca9b7cdfbdd332d269 libsigc++-2.0.15.ebuild 1829
 MD5 2097fbc4c79a21de2b7f3a7e89a35137 files/digest-libsigc++-1.2.5 67
 MD5 2456d199198c3d5a0d0f0edb607589c8 files/digest-libsigc++-2.0.5 68
 MD5 10662f31c9be983522a9e54748c50069 files/digest-libsigc++-2.0.11 70
-MD5 04e13737cb7a857a9d5bb4f991491124 files/digest-libsigc++-2.0.12 70
 MD5 c2eb227beae20aeebcd20a4f2c72612e files/digest-libsigc++-2.0.14 69
+MD5 ec7114fb42bbacbfc6e3b6a12358d03f files/digest-libsigc++-2.0.15 70
 MD5 b1f9c8d8239349f2f8501d3ff425b77b files/gcc-3.4.patch 692
 MD5 628fd3eec229a5ec7bdf9751004f9b46 files/digest-libsigc++-1.0.4-r2 67
diff --git a/dev-libs/libsigc++/files/digest-libsigc++-1.2.2 b/dev-libs/libsigc++/files/digest-libsigc++-1.2.2
deleted file mode 100644
index 7dcfeea93fb3..000000000000
--- a/dev-libs/libsigc++/files/digest-libsigc++-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9566c60c28a8f8f18e8e65a2ef0af31 libsigc++-1.2.2.tar.gz 249219
diff --git a/dev-libs/libsigc++/files/digest-libsigc++-1.2.3 b/dev-libs/libsigc++/files/digest-libsigc++-1.2.3
deleted file mode 100644
index 3ca1ab187371..000000000000
--- a/dev-libs/libsigc++/files/digest-libsigc++-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3634d8b664a2ad39f3e4c17d30939bf7 libsigc++-1.2.3.tar.gz 277375
diff --git a/dev-libs/libsigc++/files/digest-libsigc++-2.0.12 b/dev-libs/libsigc++/files/digest-libsigc++-2.0.12
deleted file mode 100644
index 1dc1deba8c7d..000000000000
--- a/dev-libs/libsigc++/files/digest-libsigc++-2.0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 edd1ad751057e82742edaa73ac5353f2 libsigc++-2.0.12.tar.bz2 1584981
diff --git a/dev-libs/libsigc++/files/digest-libsigc++-2.0.15 b/dev-libs/libsigc++/files/digest-libsigc++-2.0.15
new file mode 100644
index 000000000000..0d51bed8e161
--- /dev/null
+++ b/dev-libs/libsigc++/files/digest-libsigc++-2.0.15
@@ -0,0 +1 @@
+MD5 3da57e8fd00644390447b372e5d6103a libsigc++-2.0.15.tar.bz2 1603923
diff --git a/dev-libs/libsigc++/libsigc++-1.2.2.ebuild b/dev-libs/libsigc++/libsigc++-1.2.2.ebuild
deleted file mode 100644
index 0c1f8f279b67..000000000000
--- a/dev-libs/libsigc++/libsigc++-1.2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.2.2.ebuild,v 1.11 2005/01/09 14:56:42 corsair Exp $
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://libsigc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libsigc/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="debug"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	local myconf=""
-	use debug \
-		&& myconf="--enable-debug=yes" \
-		|| myconf="--enable-debug=no"
-	econf ${myconf} --enable-threads || die
-	emake || die "emake failure"
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog FEATURES IDEAS COPYING* \
-		README INSTALL NEWS TODO
-}
-
-pkg_postinst() {
-	ewarn "To allow parallel installation of sig++-1.0 and sig++-1.2,"
-	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."
-}
diff --git a/dev-libs/libsigc++/libsigc++-1.2.3.ebuild b/dev-libs/libsigc++/libsigc++-1.2.3.ebuild
deleted file mode 100644
index 785acfbbec7e..000000000000
--- a/dev-libs/libsigc++/libsigc++-1.2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.2.3.ebuild,v 1.9 2005/01/09 14:56:42 corsair Exp $
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://libsigc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libsigc/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="debug"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	local myconf=""
-	use debug \
-		&& myconf="--enable-debug=yes" \
-		|| myconf="--enable-debug=no"
-	econf ${myconf} --enable-threads || die
-	emake || die "emake failure"
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog FEATURES IDEAS COPYING* \
-		README INSTALL NEWS TODO
-}
-
-pkg_postinst() {
-	ewarn "To allow parallel installation of sig++-1.0 and sig++-1.2,"
-	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."
-}
diff --git a/dev-libs/libsigc++/libsigc++-2.0.14.ebuild b/dev-libs/libsigc++/libsigc++-2.0.14.ebuild
index 6316074d5a2d..6dc24e1fd536 100644
--- a/dev-libs/libsigc++/libsigc++-2.0.14.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.0.14.ebuild,v 1.2 2005/07/07 00:30:38 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.0.14.ebuild,v 1.3 2005/07/12 17:12:08 ka0ttic Exp $
 
 inherit eutils gnome.org flag-o-matic
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc ~ppc64 ~hppa ~ppc-macos ~ia64 ~mips"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 sparc x86"
 IUSE="debug doc test"
 
 src_unpack() {
diff --git a/dev-libs/libsigc++/libsigc++-2.0.12.ebuild b/dev-libs/libsigc++/libsigc++-2.0.15.ebuild
index a5ed512c53ad..d41ffa2d416b 100644
--- a/dev-libs/libsigc++/libsigc++-2.0.12.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.0.12.ebuild,v 1.1 2005/05/26 18:44:55 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.0.15.ebuild,v 1.1 2005/07/12 17:12:08 ka0ttic Exp $
 
 inherit eutils gnome.org flag-o-matic
 
@@ -9,30 +9,55 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc ~ppc64 ~hppa ~ppc-macos ~ia64"
-IUSE="debug"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc ~ppc64 ~hppa ~ppc-macos ~ia64 ~mips"
+IUSE="debug doc test"
 
-DEPEND="virtual/libc"
+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
-	if use ppc-macos ; then
-		if [ -e /usr/lib/lib/libgcc_s.1.dylib ] ; then
-			append-ldflags -lgcc_s
-		fi
+
+	if use ppc-macos && [[ -e /usr/lib/lib/libgcc_s.1.dylib ]] ; then
+		append-ldflags -lgcc_s
 	fi
+
 	local myconf
 	use debug \
 		&& myconf="--enable-debug=yes" \
 		|| myconf="--enable-debug=no"
+
 	econf ${myconf} || die "econf failed."
 	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "make install failed."
-	dodoc AUTHORS ChangeLog  README NEWS TODO
-	mv ${D}/usr/share/doc/libsigc-2.0/docs/* ${D}/usr/share/doc/${PF}/
+	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() {
diff --git a/dev-libs/libsigc++/metadata.xml b/dev-libs/libsigc++/metadata.xml
index da6fd63d0085..540ff7f83d30 100644
--- a/dev-libs/libsigc++/metadata.xml
+++ b/dev-libs/libsigc++/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<maintainer>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
+	</maintainer>
 </pkgmetadata>