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

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42)

3 files changed, 7 insertions, 61 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++/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"