From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1091313-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 74791138334
for <garchives@archives.gentoo.org>; Sun, 19 May 2019 17:55:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DB3EAE0885;
Sun, 19 May 2019 17:55:04 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AF761E0885
for <gentoo-commits@lists.gentoo.org>; Sun, 19 May 2019 17:55:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7B362344AE7
for <gentoo-commits@lists.gentoo.org>; Sun, 19 May 2019 17:55:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 388095FC
for <gentoo-commits@lists.gentoo.org>; Sun, 19 May 2019 17:54:59 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1558287372.4b16ddb1fa76dcb64b41fd1fee4a66c140975c4b.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/socketstream/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/socketstream/socketstream-0.7.0-r1.ebuild dev-libs/socketstream/socketstream-0.7.0-r2.ebuild
X-VCS-Directories: dev-libs/socketstream/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 4b16ddb1fa76dcb64b41fd1fee4a66c140975c4b
X-VCS-Branch: master
Date: Sun, 19 May 2019 17:54:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4c45ce82-9e3e-4b22-a061-e2f208f2b5b2
X-Archives-Hash: f555aa4dcfeb3c67cfab81fbfc3206f3
commit: 4b16ddb1fa76dcb64b41fd1fee4a66c140975c4b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 17:35:05 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 19 17:36:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b16ddb1
dev-libs/socketstream: Avoid unnecessary revbump
...for an ebuild that no one is feeling responsible for.
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/socketstream/socketstream-0.7.0-r1.ebuild | 35 ++++++++------------
dev-libs/socketstream/socketstream-0.7.0-r2.ebuild | 37 ----------------------
2 files changed, 14 insertions(+), 58 deletions(-)
diff --git a/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild b/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild
index 021c38edb97..741291a7e96 100644
--- a/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild
+++ b/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
-
-inherit eutils
+EAPI=7
DESCRIPTION="C++ Streaming sockets library"
HOMEPAGE="http://socketstream.sourceforge.net/"
@@ -14,31 +12,26 @@ SLOT="0"
KEYWORDS="alpha amd64 ~hppa ~ppc ~sparc x86"
IUSE="doc"
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-missing_includes.patch
+ "${FILESDIR}"/${P}-gcc47.patch
+)
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
+ default
# include/Makefile uses DIST_SUBDIRS and thus headers dont get installed
sed -i 's|^DIST_\(SUBDIRS =\)|\1|' include/Makefile.in || \
die "sed include/Makefile.in failed"
-
- epatch "${FILESDIR}"/${PV}-missing_includes.patch
- epatch "${FILESDIR}"/${P}-gcc47.patch
}
src_compile() {
- econf || die "econf failed"
- emake || die "emake failed"
-
- if use doc ; then
- emake doxygen || die "failed to build docs"
- fi
+ default
+ use doc && emake doxygen
}
src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS README* HACKING TODO
- use doc && dohtml -r docs/html/*
+ use doc && local HTML_DOCS=( docs/html/. )
+ default
}
diff --git a/dev-libs/socketstream/socketstream-0.7.0-r2.ebuild b/dev-libs/socketstream/socketstream-0.7.0-r2.ebuild
deleted file mode 100644
index 1e749b19935..00000000000
--- a/dev-libs/socketstream/socketstream-0.7.0-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ Streaming sockets library"
-HOMEPAGE="http://socketstream.sourceforge.net/"
-SRC_URI="mirror://sourceforge/socketstream/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-missing_includes.patch
- "${FILESDIR}"/${P}-gcc47.patch
-)
-
-src_prepare() {
- default
- # include/Makefile uses DIST_SUBDIRS and thus headers dont get installed
- sed -i 's|^DIST_\(SUBDIRS =\)|\1|' include/Makefile.in || \
- die "sed include/Makefile.in failed"
-}
-
-src_compile() {
- default
- use doc && emake doxygen
-}
-
-src_install() {
- use doc && local HTML_DOCS=( docs/html/. )
- default
-}