Closes bug #138112

Package-Manager: portage-2.1.1_pre2-r6

6 files changed, 120 insertions, 19 deletions

diff --git a/dev-libs/libsigc++/ChangeLog b/dev-libs/libsigc++/ChangeLog
index fdbc7a4fdd58..bd0022f2bbc5 100644
--- a/dev-libs/libsigc++/ChangeLog
+++ b/dev-libs/libsigc++/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-libs/libsigc++
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.88 2006/07/10 17:39:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.89 2006/07/12 23:48:46 pvdabeel Exp $
 
   10 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   libsigc++-2.0.17.ebuild:
@@ -19,6 +19,12 @@
   04 Feb 2006; Aron Griffis <agriffis@gentoo.org> libsigc++-2.0.16.ebuild:
   Mark 2.0.16 stable on ia64
 
+*libsigc++-1.0.4-r3 (13 Jul 2006)
+
+  13 Jul 2006; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  +libsigc++-1.0.4-r3.ebuild:
+  closes bug #138112
+
 *libsigc++-2.0.17 (02 Feb 2006)
 
   02 Feb 2006; John N. Laliberte <allanonjl@gentoo.org>
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index d4c68541654c..cfc83676c9c5 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,11 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gcc-3.4.patch 692 RMD160 1ab3afbef9bef922977c8eba1c0401750113826b SHA1 ea6c817331381f199f7167d8516064adea3185fb SHA256 2d9e971ef9399467325933206e292ed25a6eedd513e436a3a4dd7d3b267d5007
 MD5 b1f9c8d8239349f2f8501d3ff425b77b files/gcc-3.4.patch 692
 RMD160 1ab3afbef9bef922977c8eba1c0401750113826b files/gcc-3.4.patch 692
 SHA256 2d9e971ef9399467325933206e292ed25a6eedd513e436a3a4dd7d3b267d5007 files/gcc-3.4.patch 692
-DIST libsigc++-1.0.4.tar.gz 212089
+AUX sandbox.patch 2164 RMD160 793242bb26295bb56d27cee3dce79b43e4957955 SHA1 0fd3f293c91465dd3bdd5d26b7a6ee3bb21a8f41 SHA256 6ff6598a0a1edd88f8ce0848bd44583b0c1b13044793bf84e5dbe75bda2a31ec
+MD5 76aa503ad69751bccae7af6135596c9a files/sandbox.patch 2164
+RMD160 793242bb26295bb56d27cee3dce79b43e4957955 files/sandbox.patch 2164
+SHA256 6ff6598a0a1edd88f8ce0848bd44583b0c1b13044793bf84e5dbe75bda2a31ec files/sandbox.patch 2164
+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.11.tar.bz2 1434804 RMD160 01453ea77d54fee4ad62fcb9111eadc45f0af9e1 SHA1 b073e2d6489e690e7974029723abf11e41370534 SHA256 efb4781f50240c8a17b5dee0764a2a25bec397a042baf35571a4f252039a0e10
 DIST libsigc++-2.0.14.tar.bz2 713419 RMD160 4f98efca00f3d787222d437eac41c9bfe0f5c76c SHA1 3ed8fd8877cc98afe04afe14722c9ee61f5b9c6f SHA256 f7129bd9b605a1fbd9b0bea896ee2cdd3a377921e52e76fc9ff29aafd3202828
@@ -17,6 +18,10 @@ EBUILD libsigc++-1.0.4-r2.ebuild 1474 RMD160 788f9fe53b45f587edff9fb0141d71b696a
 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 1076 RMD160 bfe148b58826ae929b6b496b3b9199042d6f8d24 SHA1 8b7ca09dda6d4e492434e7c62c57b691327a99fa SHA256 7669fe0c35fc024833b808968f0bf2e51619d490ed2446dca6181fe7093ee2c7
+MD5 cc96a0fafa8534a7152b5c162c0ef413 libsigc++-1.0.4-r3.ebuild 1076
+RMD160 bfe148b58826ae929b6b496b3b9199042d6f8d24 libsigc++-1.0.4-r3.ebuild 1076
+SHA256 7669fe0c35fc024833b808968f0bf2e51619d490ed2446dca6181fe7093ee2c7 libsigc++-1.0.4-r3.ebuild 1076
 EBUILD libsigc++-1.2.5.ebuild 1429 RMD160 5b253aa21ad49ac93b7b973065daead567832275 SHA1 0c10b49664f415cb281bb46f33fc98b74b4d337c SHA256 0464e864a0d41e5338b00302efd8d7c50218ac3cd869db73d8342f415d37c59d
 MD5 aa05d95e7eb6e335444b7fd828538bb9 libsigc++-1.2.5.ebuild 1429
 RMD160 5b253aa21ad49ac93b7b973065daead567832275 libsigc++-1.2.5.ebuild 1429
@@ -45,17 +50,20 @@ EBUILD libsigc++-2.0.5.ebuild 1446 RMD160 ce07311eb9a27780f19299db9a135d35b79782
 MD5 6b17a879fe86bc2b447e8d3c6489f0c6 libsigc++-2.0.5.ebuild 1446
 RMD160 ce07311eb9a27780f19299db9a135d35b7978271 libsigc++-2.0.5.ebuild 1446
 SHA256 82c3265a2897d0170808a030db9a12aa5bca53428123df104c50741897fada12 libsigc++-2.0.5.ebuild 1446
-MISC ChangeLog 10578 RMD160 641528d300635c51f86c1067e0e911746e52ea17 SHA1 454a0e65b8364c99acb29c5d2d1b39e9a6dbbc58 SHA256 f0a3a72a9fc6f4f11eb9ffdb6076ba89f721a40b27c654ea2255e062d1b16791
-MD5 02bbc4eecafdd001571e4446381e4959 ChangeLog 10578
-RMD160 641528d300635c51f86c1067e0e911746e52ea17 ChangeLog 10578
-SHA256 f0a3a72a9fc6f4f11eb9ffdb6076ba89f721a40b27c654ea2255e062d1b16791 ChangeLog 10578
+MISC ChangeLog 10724 RMD160 c6a94289a5ea1e045cb069878197fb75bb3794e5 SHA1 188db2e7774bbd1e12e24c32b980a6333c7ea108 SHA256 55be6dff52e7acd31116b8c044da143262ffd0d160b3d78a4feb19320b02af8e
+MD5 9198d7307797f491bc7e76aba52f176d ChangeLog 10724
+RMD160 c6a94289a5ea1e045cb069878197fb75bb3794e5 ChangeLog 10724
+SHA256 55be6dff52e7acd31116b8c044da143262ffd0d160b3d78a4feb19320b02af8e ChangeLog 10724
 MISC metadata.xml 255 RMD160 c1e23d640a73041f03935350f8f37801b501fcf5 SHA1 4f2140c34df8e2600388538d969ce3cab1da1924 SHA256 1e5199bee2c4d0abb806c1cd58b1706d527f570dcec26aec624a5c5777763811
 MD5 57fc113c79155fc9e1e055642befa01e metadata.xml 255
 RMD160 c1e23d640a73041f03935350f8f37801b501fcf5 metadata.xml 255
 SHA256 1e5199bee2c4d0abb806c1cd58b1706d527f570dcec26aec624a5c5777763811 metadata.xml 255
-MD5 628fd3eec229a5ec7bdf9751004f9b46 files/digest-libsigc++-1.0.4-r2 67
-RMD160 4819263c771fada919c2bb6a121d32cd497335b7 files/digest-libsigc++-1.0.4-r2 67
-SHA256 e77ba973cc45b7be69cb0c4727bc186c5c95c1675f7149aea69472b636c517a7 files/digest-libsigc++-1.0.4-r2 67
+MD5 8351152aad652261450a6e39f0e6140b files/digest-libsigc++-1.0.4-r2 247
+RMD160 52de0f49542036187ffe6508045ecc5ef455d92a files/digest-libsigc++-1.0.4-r2 247
+SHA256 8daca3e48e06f9dcb96688c8cb661f27a0023433c7479bc2ebff31ed449b71bb files/digest-libsigc++-1.0.4-r2 247
+MD5 8351152aad652261450a6e39f0e6140b files/digest-libsigc++-1.0.4-r3 247
+RMD160 52de0f49542036187ffe6508045ecc5ef455d92a files/digest-libsigc++-1.0.4-r3 247
+SHA256 8daca3e48e06f9dcb96688c8cb661f27a0023433c7479bc2ebff31ed449b71bb files/digest-libsigc++-1.0.4-r3 247
 MD5 107f9ed9d8a0716372304d2b44120dbe files/digest-libsigc++-1.2.5 247
 RMD160 4a76f8bdee6343b6b49177252bd006f89ecc5798 files/digest-libsigc++-1.2.5 247
 SHA256 6ca770fcc408a95fa864bbd435170ad754ddcc47c2ecffbe0a84840e5c30bad3 files/digest-libsigc++-1.2.5 247
@@ -77,10 +85,3 @@ SHA256 f05c5ae0f0c23a83cb9af86d2957d30cc0f336153394fcd79b079c47c9375a1b files/di
 MD5 894f54c2644b653fff070c8fd3cde982 files/digest-libsigc++-2.0.5 250
 RMD160 c5de6139436352cfc91296d84bd30f6d4303a37a files/digest-libsigc++-2.0.5 250
 SHA256 cbf64222d43f85a775620e9feb91875536a67078c5c50aaa5c300d18b2c407ab files/digest-libsigc++-2.0.5 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEspDnKRy60XGEcJIRAo8qAKCvoEjq7AUiAzxcK5o3BsTsq8TKSgCfacQ4
-zPHzcVUGJq9flIf/OTaId2g=
-=3MU/
------END PGP SIGNATURE-----
diff --git a/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r2 b/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r2
index b085cc3b6cc8..6a9124abe6d6 100644
--- a/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r2
+++ b/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r2
@@ -1 +1,3 @@
 MD5 88d34840acc1cc5d47b347726e4a09e0 libsigc++-1.0.4.tar.gz 212089
+RMD160 b750a5b6cd75fbb7288c6e35d8f3abad9f641722 libsigc++-1.0.4.tar.gz 212089
+SHA256 4b808da7f652ee4965295b92085e1da29a59eef24924aac10c1d8fc37b8fd9b3 libsigc++-1.0.4.tar.gz 212089
diff --git a/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r3 b/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r3
new file mode 100644
index 000000000000..6a9124abe6d6
--- /dev/null
+++ b/dev-libs/libsigc++/files/digest-libsigc++-1.0.4-r3
@@ -0,0 +1,3 @@
+MD5 88d34840acc1cc5d47b347726e4a09e0 libsigc++-1.0.4.tar.gz 212089
+RMD160 b750a5b6cd75fbb7288c6e35d8f3abad9f641722 libsigc++-1.0.4.tar.gz 212089
+SHA256 4b808da7f652ee4965295b92085e1da29a59eef24924aac10c1d8fc37b8fd9b3 libsigc++-1.0.4.tar.gz 212089
diff --git a/dev-libs/libsigc++/files/sandbox.patch b/dev-libs/libsigc++/files/sandbox.patch
new file mode 100644
index 000000000000..f60811bf9647
--- /dev/null
+++ b/dev-libs/libsigc++/files/sandbox.patch
@@ -0,0 +1,50 @@
+diff -urN libsigc++-1.0.4.orig/sigc++/Makefile libsigc++-1.0.4/sigc++/Makefile
+--- libsigc++-1.0.4.orig/sigc++/Makefile	2006-07-13 01:08:00.000000000 +0200
++++ libsigc++-1.0.4/sigc++/Makefile	2006-07-13 01:11:49.000000000 +0200
+@@ -494,13 +494,11 @@
+ 	  echo ;\
+ 	  echo "  \"$(includedir)/sigc++\"" ;\
+ 	  echo ;\
+-	  echo "The entire directory will be removed now." ;\
+ 	  echo "To allow parallel installation of sigc++-1.0 and sigc++-1.2," ;\
+ 	  echo "the header files are now installed in a version specific subdirectory:" ;\
+ 	  echo ;\
+ 	  echo "  \"$(libsigcincludedir)\"" ;\
+ 	  echo ;\
+-	  rm -rf "$(includedir)/sigc++" ;\
+ 	fi
+ 
+ #---------------------------------------
+diff -urN libsigc++-1.0.4.orig/sigc++/Makefile.am libsigc++-1.0.4/sigc++/Makefile.am
+--- libsigc++-1.0.4.orig/sigc++/Makefile.am	2006-07-13 01:08:00.000000000 +0200
++++ libsigc++-1.0.4/sigc++/Makefile.am	2006-07-13 01:11:41.000000000 +0200
+@@ -46,7 +46,6 @@
+ 	  echo ;\
+ 	  echo "  \"$(libsigcincludedir)\"" ;\
+ 	  echo ;\
+-	  rm -rf "$(includedir)/sigc++" ;\
+ 	fi
+ 
+ 
+diff -urN libsigc++-1.0.4.orig/sigc++/config/Makefile libsigc++-1.0.4/sigc++/config/Makefile
+--- libsigc++-1.0.4.orig/sigc++/config/Makefile	2006-07-13 01:08:00.000000000 +0200
++++ libsigc++-1.0.4/sigc++/config/Makefile	2006-07-13 01:11:32.000000000 +0200
+@@ -275,8 +275,7 @@
+ 	  echo "The entire directory will be removed now." ;\
+ 	  echo "To allow parallel installation of sigc++-1.0 and sigc++-1.2," ;\
+ 	  echo "the header files are now installed in a version specific subdirectory." ;\
+	  echo ; \
+-	  rm -rf "$(libdir)/sigc++" ;\
+ 	fi
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+diff -urN libsigc++-1.0.4.orig/sigc++/config/Makefile.am libsigc++-1.0.4/sigc++/config/Makefile.am
+--- libsigc++-1.0.4.orig/sigc++/config/Makefile.am	2006-07-13 01:08:00.000000000 +0200
++++ libsigc++-1.0.4/sigc++/config/Makefile.am	2006-07-13 01:11:15.000000000 +0200
+@@ -16,6 +16,5 @@
+ 	  echo "To allow parallel installation of sigc++-1.0 and sigc++-1.2," ;\
+ 	  echo "the header files are now installed in a version specific subdirectory." ;\
+ 	  echo ; \
+-	  rm -rf "$(libdir)/sigc++" ;\
+ 	fi
+ 
diff --git a/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild b/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild
new file mode 100644
index 000000000000..00798ae81dde
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-1.0.4-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 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.1 2006/07/12 23:48:46 pvdabeel Exp $
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://libsigc.sourceforge.net/"
+SRC_URI="http://download.sourceforge.net/libsigc/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sh ~sparc ~x86"
+IUSE="debug"
+
+inherit eutils
+
+DEPEND=""
+
+src_compile() {
+	use debug \
+		&& myconf="--enable-debug=yes" \
+		|| myconf="--enable-debug=no"
+	econf ${myconf} || die
+
+	epatch ${FILESDIR}/sandbox.patch || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README* INSTALL NEWS
+}
+
+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."
+}