From e20397515960c003a9eb12a8fbffdb4a2e1f3cee Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Wed, 5 Apr 2017 19:14:17 +0200
Subject: dev-libs/fampp2: Remove STLport dependency

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4369
---
 dev-libs/fampp2/fampp2-7.0.1-r2.ebuild | 60 ----------------------------------
 dev-libs/fampp2/fampp2-7.0.1-r3.ebuild | 59 +++++++++++++++++++++++++++++++++
 dev-libs/fampp2/metadata.xml           |  3 --
 3 files changed, 59 insertions(+), 63 deletions(-)
 delete mode 100644 dev-libs/fampp2/fampp2-7.0.1-r2.ebuild
 create mode 100644 dev-libs/fampp2/fampp2-7.0.1-r3.ebuild

(limited to 'dev-libs/fampp2')

diff --git a/dev-libs/fampp2/fampp2-7.0.1-r2.ebuild b/dev-libs/fampp2/fampp2-7.0.1-r2.ebuild
deleted file mode 100644
index 82360f4563a1..000000000000
--- a/dev-libs/fampp2/fampp2-7.0.1-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="C++ wrapper for fam"
-HOMEPAGE="https://sourceforge.net/projects/fampp/"
-SRC_URI="mirror://sourceforge/fampp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples stlport"
-
-RDEPEND="virtual/fam
-	stlport? ( dev-libs/STLport )
-	>=dev-libs/ferrisloki-2.0.3[stlport?]
-	>=dev-libs/libsigc++-2.6:2
-	dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	# Fix compat with libsigc++-2.6, #569700
-	"${FILESDIR}/${PN}-7.0.1-libsigc++-2.6.patch"
-	# Fix completely broken buildsystem
-	"${FILESDIR}/${PN}-7.0.1-fix-buildsystem.patch"
-	# Fix noexcept(true) for dtors in >=C++11 with GCC 6, #595308
-	"${FILESDIR}/${PN}-7.0.1-fix-gcc6.patch"
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	# libsigc++-2.6 requires building with C++11
-	append-cxxflags -std=c++11
-
-	# glib and gtk+ are only required for some examples
-	econf \
-		--disable-static \
-		--disable-glibtest \
-		--disable-gtktest \
-		--with-stlport="${EPREFIX}/usr/include/stlport" \
-		$(use_enable stlport) \
-		$(use_with examples)
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/fampp2/fampp2-7.0.1-r3.ebuild b/dev-libs/fampp2/fampp2-7.0.1-r3.ebuild
new file mode 100644
index 000000000000..7854cb30ecee
--- /dev/null
+++ b/dev-libs/fampp2/fampp2-7.0.1-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="C++ wrapper for fam"
+HOMEPAGE="https://sourceforge.net/projects/fampp/"
+SRC_URI="mirror://sourceforge/fampp/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-libs/ferrisloki-2.0.3
+	dev-libs/glib:2
+	>=dev-libs/libsigc++-2.6:2
+	virtual/fam
+	x11-libs/gtk+:2"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	# Fix compat with libsigc++-2.6, #569700
+	"${FILESDIR}/${PN}-7.0.1-libsigc++-2.6.patch"
+	# Fix completely broken buildsystem
+	"${FILESDIR}/${PN}-7.0.1-fix-buildsystem.patch"
+	# Fix noexcept(true) for dtors in >=C++11 with GCC 6, #595308
+	"${FILESDIR}/${PN}-7.0.1-fix-gcc6.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	# libsigc++-2.6 requires building with C++11
+	append-cxxflags -std=c++11
+
+	# glib and gtk+ are only required for some examples
+	econf \
+		--disable-static \
+		--disable-glibtest \
+		--disable-gtktest \
+		--disable-stlport \
+		$(use_with examples)
+}
+
+src_install() {
+	default
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/fampp2/metadata.xml b/dev-libs/fampp2/metadata.xml
index 9d356aef781a..37d3ef415f8a 100644
--- a/dev-libs/fampp2/metadata.xml
+++ b/dev-libs/fampp2/metadata.xml
@@ -5,9 +5,6 @@
 		<email>cpp@gentoo.org</email>
 		<name>Gentoo C++ Project</name>
 	</maintainer>
-	<use>
-		<flag name="stlport">Include support for <pkg>dev-libs/STLport</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">fampp</remote-id>
 	</upstream>
-- 
cgit v1.2.3-65-gdbad