Update ebuild, drop old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 23 insertions, 97 deletions

diff --git a/dev-libs/libsigc++/ChangeLog b/dev-libs/libsigc++/ChangeLog
index b9aef1f648c8..ba33812b8ba3 100644
--- a/dev-libs/libsigc++/ChangeLog
+++ b/dev-libs/libsigc++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libsigc++
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.194 2014/10/02 12:02:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.195 2014/12/02 22:38:59 pacho Exp $
+
+  02 Dec 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/libsigc++-2.3.2-missing-include.patch, -libsigc++-2.3.2-r1.ebuild,
+  libsigc++-1.2.7.ebuild:
+  Update ebuild, drop old
 
 *libsigc++-2.4.0 (02 Oct 2014)
 
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index a97a2b946d81..eae8804eefc9 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -2,21 +2,18 @@
 Hash: SHA256
 
 AUX libsigc++-1.2.7-fix-install.patch 457 SHA256 8efad5f909cb3202e79e1506767c97d5e2ce135357f3a88e022402e06703913c SHA512 aa3b8e38ae64e8a0c833b530e1717944a3849c9396988c343e0ad71ada31362472c2013b82911333cb468aad56238b505ef1c2b45cd1866d5456a5a972011f38 WHIRLPOOL 40383105a3a5544f2261ca915f9b8ae0c2a4391ecee9ae1a61e04e19cb9a0691fb0eac565ed28c3b7956c39309b59a76ed91ebd0ff4508714bcb82e7d33cd350
-AUX libsigc++-2.3.2-missing-include.patch 793 SHA256 98daf72d6925ec66b5c7c678889af25c59df0a8513c42fdb1c76e4c620702ea1 SHA512 ccea48816671086d55d2b84cc385dbade88e5b59925145d9d763e8961434e5b3391735b2d7a4df186d0496e872aaafe4235b4c978ef980b8db22c609eac783c1 WHIRLPOOL caa6190063ef266dbe8d82087e440b0f259b580591401ceed0075a528de7e4d9bf94479c8e95982fa719a1e2f1d05ef382ffaa9c3cd914799d9bd66809de86d4
 DIST libsigc++-1.2.7.tar.bz2 326205 SHA256 d9163d90e259bfde9164c7b218475a7664a7907a1b3197f17bc1035f36112225 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f WHIRLPOOL dc6df83f3d39883993f612150a62cfc470b9eabd28f36bb674d90daf80de894d3d37541df572d85f8873cba4d8a4e70c08ae54f83476c33f839bc86ea5b3cb88
 DIST libsigc++-2.3.1.tar.xz 3458088 SHA256 67d05852b31fdb267c9fdcecd40b046a11aa54d884435e99e3c60dd20cd60393 SHA512 8c9aa63c56e978ec3e38fda9919ffbba173b97342d0e19d0ae3126e9edb97aa1d42e79897a65b054044e87604f67f1f804db8d7a8e3dc68540b1441188b8a1ef WHIRLPOOL 66f5edf5d974eadac4782929b6e2b9bf55268502facd9323a6a572fef521d613b2223331f9c97977b191538ed32e72399eaf4b0f40d4e58e4bbb6f0d0755ff39
-DIST libsigc++-2.3.2.tar.xz 3592592 SHA256 f0305bb6d2185de1513b35843f3d4a85abfec7c969034140d56cf14ce70aa411 SHA512 e62f221944c635881e14370810d3fce1c980ae7388ee43a30a3ccaec5bc320bc4bb03c9c5a438cacba26cab923f3df36408406fca9ba0bb37f29f1b69d885c04 WHIRLPOOL 4ccb3b012cc3d0c607c299e116bfd37ffbcb26d163f12ea4ed0bce5b74372062a42647813cd6958b1bc2467c410982cd5ea6a6c615dd9a44d25561f65cd8f629
 DIST libsigc++-2.4.0.tar.xz 3630260 SHA256 7593d5fa9187bbad7c6868dce375ce3079a805f3f1e74236143bceb15a37cd30 SHA512 b5024768d249ae04ce9090ea3467dca05faf455ab568204da1a8e5ba728b5c45bf345b8516bfa4643afdee4c5981bb8b560800ac0960e4a239c0a66a2453c984 WHIRLPOOL 342770ef34f392ae85a9bbbb08c074807e961c7124c186c5f555b57d982140f2c3c93a76de86ec97556281cfd572a7120cc5deea28b6615be9e3f1311da8dbdb
-EBUILD libsigc++-1.2.7.ebuild 1030 SHA256 6827976b2e2b0e681537840e7a3c7fa204e6f5cfd0007104d8943baa29004a76 SHA512 a2d725e8c1672065e1891e3a516ebefee0745f6226f1be8f08ff6aef797674e75e0ba067012b89974c5b87c46bdc461a1c6405b328aa663c9256f9e8b2f668a1 WHIRLPOOL 9e311d9d63b42cdd051ac28e9ee6392bffa395cade8909918a8b1318812fba3c48243874efc1d472e8dc6631c716161024a4376c1b6d6c57041a33e5b86be632
+EBUILD libsigc++-1.2.7.ebuild 1068 SHA256 a7304670941c94bfda2abaded6d3024330f24249e981b6b3f43dc322ab6c4e0e SHA512 b77434b9f2809a3c957ae98b799f404aaa1f1517356ff390a4e7d3a742a7583d9afa84841a127cad4611d969d8e0a58d65085229c2d9aaaa8420c8f37526e990 WHIRLPOOL 90125e9c73cee909b06d72174ad2d6b3bc4f4c551b987266b5265c27e57f3f4ca02f0db2366684eceac3847a09243c98393aae6d3279f82d4a1b7bdbef9aa1b0
 EBUILD libsigc++-2.3.1.ebuild 1412 SHA256 b6161a245c81cfeecf63b4b71e50406e0efdfca16f70e23f363f67bb5a919f14 SHA512 0879a95ed8360b85a61ec1ee06aba727656a42cff986eb33e3cfeda885bc5e00199073a4a49047dd879717493b0a5c3993699a185e594bca95b581532709eede WHIRLPOOL 6afad09e3e849378286447b62266ec09545902e3ab800c36312b07fe56693246d66f81aa7bb8c5f89d4575d13b882b7ae35ac1df0c133b46c905d6835ef54b6e
-EBUILD libsigc++-2.3.2-r1.ebuild 1507 SHA256 b708ae2c97a66d7961603a1aacb574e0165410553cdc03bec5c963cf4ef9546f SHA512 aca205209c52264c00d7a9c5cb0e05e204e979d0de18533e91ebe4ee0f109134df8d9c0464cb2577b0824299180242bfeb20c841e8225d66dde8f87d2aeb37b8 WHIRLPOOL 21558d55d78815bfa06511060807caafb0209ad4a8e9d50920d19e56d8181129c60db065683539c8e4b5d2a84e6052285faa2b123054b2c0b99a5f4cedc1821b
 EBUILD libsigc++-2.4.0.ebuild 1393 SHA256 6dd8e4bf70d0a220e7089499f3d082c114a2216327dd543f779f064bae83c9a6 SHA512 3c17aae43e97059b65ef1f8a249395e3970f6ccfefb008f2bda7d6f50ec509908f5d67a194b6ed85a520c74889e437bc14aecc06eb6db04b1615bcc3e197b76e WHIRLPOOL e1b92c875353d19f924947a8897c2a6d7d90a664131d85e6fa9d688ec0cfdd1adf227ae2149a15ba1eca15aef71b4a78ef348579f34460eadfbaf12d5c820dd9
-MISC ChangeLog 24186 SHA256 c232fb8a0e2efb7bd6cd46804247d925b773078c5da0225e4693a9a12b0f55f4 SHA512 9411c02db03fa3511d6a633ed1aef9aa48439e41a9e423ef6028423ecb05a3b490ea09653f798e58c62400ee600848d12b895bbf2aacc500a7f8a1b1e8886af0 WHIRLPOOL 2bac3b5c4ce1c7f30bcfb830c17b15dac03286528c947b53811cbb23175e548a7e2afdb4bd868ca116748431b7a5bac8f13b0b256e7a9c0f62a28a93b96c4cc4
+MISC ChangeLog 24361 SHA256 5f042f7386daab8d7625fa448ace96fb5ac1618a975fc4696ac508b65eb73ff2 SHA512 94284179dd0cd3f6f689c8edaccb743cf8055613edd41e3341d5ae46db6ed35b692d3ab15e383389b4ebdc5c3a578c71e77c8720054942da1ad0fede84d3d0ca WHIRLPOOL fb37e552f20b99c6afced6945ac48c80ce6d88bd5b8a139ed68719e3aa1c4d39b95ed4b94df68faffeccac7e62067f3deaf1f23df621c7efc0931b036c5a4d37
 MISC metadata.xml 162 SHA256 7d0ce82d5ca3b20cb1c4641c7b7aae7082fd6be059b85fab9699095fd965f2e9 SHA512 baf4e2f4c64ab0ecc4985c069e360293c4394ea6a87c1baed2e9e91df8dca76e2371eb4be2df5ba009beb3de9a0e02561dd01accf2645e1dc5d0a23edbd8f8b6 WHIRLPOOL 35e7795de1da836c4969acee5aac0cfef4c461b1e5dc124d7f751e46efd1c3816b70824aad884fe77258b16cf3476b92b983593089aa7c152e701d0181a0e6be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQtPt4ACgkQCaWpQKGI+9QauACfew4Cn/OqPtZzmRkDJv1DJoXw
-0hcAn0hpN0qsR+Z6e6VScxKkQdCE+aZg
-=S+T3
+iEYEAREIAAYFAlR+P4QACgkQCaWpQKGI+9R0zwCcDgpWrm9xrYd4a0OrOCB913RP
+sqEAoIFea73+iLwwhLaPjSA4qN3Nct6S
+=+hbh
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libsigc++/files/libsigc++-2.3.2-missing-include.patch b/dev-libs/libsigc++/files/libsigc++-2.3.2-missing-include.patch
deleted file mode 100644
index 360694887e92..000000000000
--- a/dev-libs/libsigc++/files/libsigc++-2.3.2-missing-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From df361299c3f9a0922a683e5fa3869764932bb19a Mon Sep 17 00:00:00 2001
-From: Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
-Date: Fri, 8 Aug 2014 12:47:02 +0200
-Subject: Add an include in limit_reference.h
-
-* sigc++/macros/limit_reference.h.m4: limit_reference.h must include
-visit_each.h, with the primary definition of template struct visitor.
-https://mail.gnome.org/archives/libsigc-list/2014-August/msg00001.html
-
-diff --git a/sigc++/macros/limit_reference.h.m4 b/sigc++/macros/limit_reference.h.m4
-index 802446c..bb4b3b7 100644
---- a/sigc++/macros/limit_reference.h.m4
-+++ b/sigc++/macros/limit_reference.h.m4
-@@ -137,6 +137,7 @@ divert(0)
- 
- _FIREWALL([LIMIT_REFERENCE])
- 
-+#include <sigc++/visit_each.h>
- #include <sigc++/type_traits.h>
- #include <sigc++/trackable.h>
- 
--- 
-cgit v0.10.1
-
diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
index b35b30345f93..8ae80095df4d 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.2.7.ebuild,v 1.10 2013/06/29 12:18:33 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.2.7.ebuild,v 1.11 2014/12/02 22:38:59 pacho Exp $
 
-EAPI="3"
+EAPI=5
 GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit autotools gnome2 eutils
 
@@ -18,13 +19,8 @@ IUSE=""
 DEPEND="sys-devel/m4"
 RDEPEND=""
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog FEATURES IDEAS README NEWS TODO"
-	G2CONF="${G2CONF} --enable-maintainer-mode --enable-threads"
-}
-
 src_prepare() {
-	gnome2_src_prepare
+	DOCS="AUTHORS ChangeLog FEATURES IDEAS README NEWS TODO"
 
 	# fixes bug #219041
 	sed -e 's:ACLOCAL_AMFLAGS = -I $(srcdir)/scripts:ACLOCAL_AMFLAGS = -I scripts:' \
@@ -37,4 +33,11 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-fix-install.patch"
 
 	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-maintainer-mode \
+		--enable-threads
 }
diff --git a/dev-libs/libsigc++/libsigc++-2.3.2-r1.ebuild b/dev-libs/libsigc++/libsigc++-2.3.2-r1.ebuild
deleted file mode 100644
index 3f241d98520b..000000000000
--- a/dev-libs/libsigc++/libsigc++-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.3.2-r1.ebuild,v 1.1 2014/09/07 12:41:18 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND=""
-DEPEND="sys-devel/m4"
-# Needs mm-common for eautoreconf
-
-src_prepare() {
-	# don't waste time building examples
-	sed -i 's|^\(SUBDIRS =.*\)examples\(.*\)$|\1\2|' \
-		Makefile.am Makefile.in || die "sed examples failed"
-
-	# don't waste time building tests unless USE=test
-	if ! use test ; then
-		sed -i 's|^\(SUBDIRS =.*\)tests\(.*\)$|\1\2|' \
-			Makefile.am Makefile.in || die "sed tests failed"
-	fi
-
-	# Add an include in limit_reference.h (from 'master'), bug #522166
-	epatch "${FILESDIR}/${P}-missing-include.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	filter-flags -fno-exceptions
-
-	gnome2_src_configure \
-		$(use_enable doc documentation) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		dohtml -r docs/reference/html/* docs/images/*
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}