Stable on amd64 and x86, wrt bug #514246. Drop old revision

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

4 files changed, 16 insertions, 71 deletions

diff --git a/net-libs/socket++/ChangeLog b/net-libs/socket++/ChangeLog
index 934773aa0d90..6efebed4c667 100644
--- a/net-libs/socket++/ChangeLog
+++ b/net-libs/socket++/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/socket++
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/ChangeLog,v 1.19 2015/07/10 09:44:04 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/ChangeLog,v 1.20 2015/07/28 08:15:09 pinkbyte Exp $
+
+  28 Jul 2015; Sergey Popov <pinkbyte@gentoo.org> -socket++-1.12.12-r1.ebuild,
+  socket++-1.12.12-r2.ebuild:
+  Stable on amd64 and x86, wrt bug #514246. Drop old revision
 
 *socket++-1.12.13 (10 Jul 2015)
 
diff --git a/net-libs/socket++/Manifest b/net-libs/socket++/Manifest
index 05664af9b0de..df171acedbcb 100644
--- a/net-libs/socket++/Manifest
+++ b/net-libs/socket++/Manifest
@@ -5,19 +5,18 @@ AUX socket++-1.12.12-gcc47.patch 591 SHA256 2c51a86c887a3d4bcc0a9c94206f8c09026c
 AUX socket++.pc 196 SHA256 1daecd35722309e21232a8dbaf7f7da1bc435c3ae9ef2223f2d647c159ffcb24 SHA512 72f2c5b6acdb8384a94da986298a56c314b7520de06ae85fc1d4bce248580bf871740ffa6e8696414abc161fdd40e6d9005ef3a322e316bac7f4bbac6afecb1e WHIRLPOOL e35218cdac2183867f932c81c7b4431f4a9dd14bab474ef14f17adbba15040d31aa00b2c803ce99e8f97e60c416b093a9721152aca44c61e7277ba33f7425837
 DIST socket++-1.12.12.tar.gz 64373 SHA256 e779cfe92ee2fd73841f91b0192350e5b796bedc11f1e69c4f1d792851cdc28d SHA512 3cc45721da058114586553e9d758fbbba5a135cd09289b5362dd573a2070aa3330d7b7d08b42a39fbb874314aa7e6f05bf571d36628ef63ba95ff6e1e9b356b6 WHIRLPOOL 5e2f2bfc6ef4433db3ab2e26e3c94eeb301c85283602a60b8eeef6379c609dbbd2d649810ca15f822cc4d8774b0d7a59ce04c15692f004d7420ad6bcdafaf67d
 DIST socket++-1.12.13.tar.gz 64263 SHA256 755cdcac06d40fcca2b221f840e05f89a86298bc3bfc518b51a57b42f0512b19 SHA512 080f4cc71c4edcf56d81b8574ff357bc24f7a740a6a3c7e92a2dfd7d8910193e919fc270fcc8e96ea769518854b6e45ec79b949ecaef69f30edf821ae4bd625b WHIRLPOOL c08fd6641089107933f8c91a4b483881a7798aecf88702f17bd83f880698abcbb20f2951c39c4a0e49e495bbf9092ed614cb2aca1c99f86951b4598b6bdfe3d1
-EBUILD socket++-1.12.12-r1.ebuild 1546 SHA256 7dcbad363d796d900a420c9fcec33210c630839d275c43f09e804088ef3ad180 SHA512 8d2d654eba2fd8a2e85c2e9df69b1278a5bb2819a8f0009ce3187b83366596c3c0f981489fcc5c4a0ac85cdc98f90efe30fba6d8bec1ed22c65bc808d1c0b561 WHIRLPOOL c704dde002f9ffffe5e0be569c0df743b4b5ce20507a293ba686453320fffbb52c489142b50741725fe238445c3c1a28246cac2fd435d9b892c60076437fc34e
-EBUILD socket++-1.12.12-r2.ebuild 925 SHA256 c275196b678997c86337a4d5ded48520b33465c48c42d2e6617d2c2fa08ac747 SHA512 9d7d4d7cd4e6626b1dd300adb7e30d522b5b5a8d46e6065c14e3c0aa88e6a3d07e21efea6da683bcbc4a59ffe119264f1620e734449d8285174dc32e5668c62f WHIRLPOOL 35f6d4f70a915e2629ab925c6fab24402c9024030ebc6fa446ccca34b30c38b6389eb08ff0435b65cbc524119103bee76364f959da81da6b7f969695ea8549ac
+EBUILD socket++-1.12.12-r2.ebuild 923 SHA256 fe6cfd466837bc68a25b68e17a54df68b1178ab7c83cf308084ee430de9d5ea6 SHA512 cdf46f28b8091e3ffd4f5979d8fc1ca531c4ca3f48414bc0501c10fb1bad13f7a78dec83e065b54e13da7d032420a2f5a50bfd5d0ceab7add28a644f7c45a0c2 WHIRLPOOL a960bf9578b7e3ad1a9365af71b5e6781d7e88275ded3da5c5cc035b44940c502c493a95ad649ae6bb4c4ea8f5f87c8a440d22bad56b6e1bd94aa01c053f8d6c
 EBUILD socket++-1.12.13.ebuild 920 SHA256 3c1eff11e8346252a101597069db5752bb093a2cef8a3abf4f6d2ab47c70d84a SHA512 e73e4f700b0c52e368b5253fe03c117e51b4ee862a5016daf07766649da2e20997ed2917d22be1b0ebc74ef172808e28920f93669fe87ad0cef5227679d0c5f0 WHIRLPOOL 186081302498c7ac9cf56539244ce5ee8c94b78281889d8207778e0875eb8c44439adbfe19c003543e00c8fdff47b272db8b6f0ee30e5f1d6c061e0411d570d9
-MISC ChangeLog 2992 SHA256 607ee1de205f29e54cebef3c7ae266b6ce5eb195217dfaf7fa69057a879b3061 SHA512 f44f6dd7bad8b33bb4051e98b87a2b293e274366f95274386a5f56f48f149ffbe84107fabd3914a3b8a96805921994bd3acc2e086c1fadd4cc0e19fd23923fb1 WHIRLPOOL 1ba611e04dc8ea1184ed2d0d54d03dcfe7177f14960017915463a2f377ed244e0171a4e2a4ded8ac9b9336df138067dc3a3f0a7a435986c49dffe8f81ca96282
+MISC ChangeLog 3164 SHA256 784d69c68e80459bcf0706a1ef29047f71057ce1f5537e8120222c382b27e376 SHA512 8c1ede5d28defb9f25f34954d79086b405fdb6df41c9107f292760debbb2e94ebe0efc66118b6529246c72ec196896000c0ba7e1b3991fd5a36c87c029d1a1f4 WHIRLPOOL b1ebf7669aa0f49770298821824a79813ce14dcd6d46d91308842a9233e80720107c3ee545a868c4f30626eb3fc2bf9c6c85f1852d6fc3f998adeacf88783117
 MISC metadata.xml 341 SHA256 707f029d483948efcda82f3c9e749578d1a96e4a7c81300d401cf9ad64b4b438 SHA512 aa3db0149ed9771280cd4507c7d92e33c2628242c7ec33a2a649706df4220835adf1c9273364746f706b6559c2f2b504333fb72d1dab19a17724fb034ab65948 WHIRLPOOL 46a3e438b8306aa1ea75e9d080331dd910f8542e80e1572db2feb558ca40bd101fa2c42bf8b87af762fdb027c131e81a27f6d8b3519e1275c5a7755be6ddefb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVn5PkAAoJECo/aRed9267Hs8H/AkVVFFTgJnjUWItHYQB6aQQ
-GLlJNVE8mpqv28AMXLl96t9Z5QJ1hGCyRv8ivX0vIe0gFCquRHmAs6OnkJNynrD5
-1DnW3k3YTg1fThzEvSCZ8US7A1vjoe6RuYYxJezsMBYO4H6dENv/AUv780+8uz+K
-4bebayf/x7KcWSUBtDgmNcxRchUfQoCZozuIvYeYnRArlWlZgK3VHGVVrGqkOL3J
-d5lvw0ubwYB8IX9xyce50zAHI+sJM0GsCJUq3yQU+MzeDJ9+n7Lp9JtQI05tlaA8
-YHbVCdoZ7OSrsNv/L4Jo0bWlTYz0u/ak2G3HuS1l9acDECy3lV0DXEXoOh1DB1E=
-=/IzU
+iQEcBAEBCAAGBQJVtzoOAAoJECo/aRed9267w8YH/2PX50FoJO7UwGzI3T7WMA7b
+wHWrDntj1u87HsH8uZ2yp+1gOLdMIIqgnUYkWWdAEJbV/mbRDx264gDnFGKIPyo4
+w9qHIYU7z7dHRzXYnVtVGOcOPCf/ICPZxLE8p2myx6HfxAj1/szab4ADwrPl4QTU
+Ks1lot6EL3hbQbw0BHKOMnag/sm6lQIdLAqOpDR0PKmHUs47xCweYl6+O+iSPEyB
+59jwCYId70xUs/2bMdQbco1RIouJ/pGgMVuiytGLhVjVkZLwwA5UN2W/jUfhXyBb
+M0u/wpgfSXqn5CXOu0o7knLXsg4/7Z3PMcA0pIf7iBgwEYEg4R+vDS8curjjzYY=
+=+O5b
 -----END PGP SIGNATURE-----
diff --git a/net-libs/socket++/socket++-1.12.12-r1.ebuild b/net-libs/socket++/socket++-1.12.12-r1.ebuild
deleted file mode 100644
index 104244ed2729..000000000000
--- a/net-libs/socket++/socket++-1.12.12-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/socket++-1.12.12-r1.ebuild,v 1.10 2013/09/07 08:35:52 pacho Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="C++ Socket Library"
-HOMEPAGE="http://www.linuxhacker.at/socketxx/"
-SRC_URI="http://www.linuxhacker.at/linux/downloads/src/${P}.tar.gz"
-
-LICENSE="freedist GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~mips x86"
-IUSE="debug doc"
-RESTRICT="bindist"
-
-DEPEND="sys-devel/libtool
-	sys-apps/texinfo"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc47.patch"
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable debug) || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		cd "${S}"/doc
-		einfo "Building HTML documentation"
-		# the 'html' target in both ${S}/Makefile and ${S}/doc/Makefile
-		# do indeed exist (and succeed when run manually), but fail when
-		# 'make html' is done here, so we call makeinfo ourselves.
-		makeinfo --html -I . -o html socket++.texi || die "makeinfo failed"
-	fi
-}
-
-src_test() {
-	cd "${S}"/test
-	make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README* THANKS || die "dodoc failed"
-
-	insinto /usr/lib/pkgconfig
-	doins "${FILESDIR}"/${PN}.pc || die "failed to install pkgconfig script"
-	dosed "s/PV/${PV}/" /usr/lib/pkgconfig/${PN}.pc || die "sed failed"
-
-	if use doc ; then
-		dohtml doc/html/* || die "dohtml failed"
-	fi
-}
diff --git a/net-libs/socket++/socket++-1.12.12-r2.ebuild b/net-libs/socket++/socket++-1.12.12-r2.ebuild
index 7e20f7713525..d65c6c83be72 100644
--- a/net-libs/socket++/socket++-1.12.12-r2.ebuild
+++ b/net-libs/socket++/socket++-1.12.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/socket++-1.12.12-r2.ebuild,v 1.1 2015/07/10 09:05:50 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/socket++-1.12.12-r2.ebuild,v 1.2 2015/07/28 08:15:09 pinkbyte Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.linuxhacker.at/linux/downloads/src/${P}.tar.gz"
 
 LICENSE="freedist GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~x86"
+KEYWORDS="~alpha amd64 ~mips x86"
 
 IUSE="debug static-libs"