public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/fampp2/
@ 2015-12-29 12:08 Pacho Ramos
  0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2015-12-29 12:08 UTC (permalink / raw
  To: gentoo-commits

commit:     15095ca164b9dcc5a77b9878f6b97f183ffeb98d
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 11:09:39 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 12:07:34 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15095ca1

dev-libs/fampp2: Fix building with latest glibmm/libsigc++ (#569700)

Package-Manager: portage-2.2.26

 dev-libs/fampp2/fampp2-7.0.1-r1.ebuild | 57 ++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/dev-libs/fampp2/fampp2-7.0.1-r1.ebuild b/dev-libs/fampp2/fampp2-7.0.1-r1.ebuild
new file mode 100644
index 0000000..665bb03
--- /dev/null
+++ b/dev-libs/fampp2/fampp2-7.0.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils 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"
+
+src_prepare() {
+	# Fix compat with libsigc++-2.6
+	find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die
+	find -name '*.hh' -exec sed -i '/sigc++\/object.h/d' {} + || die
+	find -name '*.cpp' -exec sed -i '/sigc++\/object.h/d' {} + || die
+	find -name '*.cpp' -exec sed -i '/sigc++\/object_slot.h/d' {} + || die
+	append-cxxflags -std=c++11
+
+	sed -ri \
+		-e '/^C(XX)?FLAGS/s:-O0 -g::' \
+		-e '/^LDFLAGS/s:-Wl,-O1 -Wl,--hash-style=both::' \
+		configure || die "sed failed"
+}
+
+src_configure() {
+	# glib and gtk+ are only required for some examples
+	econf \
+		--disable-glibtest \
+		--disable-gtktest \
+		--with-stlport=/usr/include/stlport \
+		$(use_enable stlport)
+
+	if ! use examples ; then
+		sed -i -e '/^SUBDIRS/ s/examples//' Makefile.in || die "sed failed"
+	fi
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/fampp2/
@ 2016-09-27 21:28 David Seifert
  0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-09-27 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     f87b7a1668fd7ee8000e375950487248f95f7bdb
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 21:27:35 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 21:28:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87b7a16

dev-libs/fampp2: Remove old ebuilds

Package-Manager: portage-2.3.1

 dev-libs/fampp2/Manifest            |  1 -
 dev-libs/fampp2/fampp2-6.0.1.ebuild | 33 ------------------------
 dev-libs/fampp2/fampp2-7.0.1.ebuild | 50 -------------------------------------
 3 files changed, 84 deletions(-)

diff --git a/dev-libs/fampp2/Manifest b/dev-libs/fampp2/Manifest
index 9ba494d..0fe680e 100644
--- a/dev-libs/fampp2/Manifest
+++ b/dev-libs/fampp2/Manifest
@@ -1,2 +1 @@
-DIST fampp2-6.0.1.tar.bz2 282852 SHA256 8f54e0226cac5ab94f80aff1c11104d305a63183a88267e259b86059c93d58c0 SHA512 f61ff11596c22bdbca21d280a19500110b0df1caaec33abee7ac304b046f301222dfa5908de1137e4fd84cbb69de297fa313acb333c3a5f54f5788d5ff5c11c0 WHIRLPOOL af51b86054c5589ae3312980112e0244666460bf394f48319b3b1c8d84901156c7b913b3706fdc89ed3ba8189ea1abd748227a909b53a276fd22804748e5de99
 DIST fampp2-7.0.1.tar.bz2 288073 SHA256 2bfcc28755dbec832b395bad63b8cf40896b0d4bfbca02c57477a164ca2f0244 SHA512 317a5cfd383418265cafea0840af8b7c714a04b34265ebfba73230ff2492df8f7884797529916693ab489bdbc94799ca83e015cf0bcfffaea6b28b3a7f9ccbd0 WHIRLPOOL 513b6c9f42f9fdacb089079420212d5f79394aec339061d5edd0e7faa34e0b20f33ae98258771a9d60f958683f8bdb6cedae4cd1067f76266f7ee79053b0d9a7

diff --git a/dev-libs/fampp2/fampp2-6.0.1.ebuild b/dev-libs/fampp2/fampp2-6.0.1.ebuild
deleted file mode 100644
index ad02d18..00000000
--- a/dev-libs/fampp2/fampp2-6.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-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=""
-
-DEPEND="virtual/fam
-	dev-libs/STLport
-	dev-libs/ferrisloki
-	>=dev-libs/libsigc++-2.0.0
-	=dev-libs/glib-2*
-	=x11-libs/gtk+-2*"
-
-src_prepare() {
-	sed -ri \
-		-e '/^C(XX)?FLAGS/s:-O0 -g::' \
-		-e '/^LDFLAGS/s:-Wl,-O1 -Wl,--hash-style=both::' \
-		configure
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}

diff --git a/dev-libs/fampp2/fampp2-7.0.1.ebuild b/dev-libs/fampp2/fampp2-7.0.1.ebuild
deleted file mode 100644
index ddc05a8..00000000
--- a/dev-libs/fampp2/fampp2-7.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-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
-	dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -ri \
-		-e '/^C(XX)?FLAGS/s:-O0 -g::' \
-		-e '/^LDFLAGS/s:-Wl,-O1 -Wl,--hash-style=both::' \
-		configure || die "sed failed"
-}
-
-src_configure() {
-	# glib and gtk+ are only required for some examples
-	econf \
-		--disable-glibtest \
-		--disable-gtktest \
-		--with-stlport=/usr/include/stlport \
-		$(use_enable stlport)
-
-	if ! use examples ; then
-		sed -i -e '/^SUBDIRS/ s/examples//' Makefile.in || die "sed failed"
-	fi
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/fampp2/
@ 2017-04-05 17:15 David Seifert
  0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-04-05 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     e20397515960c003a9eb12a8fbffdb4a2e1f3cee
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 17:14:17 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 17:14:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2039751

dev-libs/fampp2: Remove STLport dependency

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4369

 .../{fampp2-7.0.1-r2.ebuild => fampp2-7.0.1-r3.ebuild}    | 15 +++++++--------
 dev-libs/fampp2/metadata.xml                              |  3 ---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/dev-libs/fampp2/fampp2-7.0.1-r2.ebuild b/dev-libs/fampp2/fampp2-7.0.1-r3.ebuild
similarity index 82%
rename from dev-libs/fampp2/fampp2-7.0.1-r2.ebuild
rename to dev-libs/fampp2/fampp2-7.0.1-r3.ebuild
index 82360f4563a..7854cb30ece 100644
--- a/dev-libs/fampp2/fampp2-7.0.1-r2.ebuild
+++ b/dev-libs/fampp2/fampp2-7.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,13 +12,13 @@ SRC_URI="mirror://sourceforge/fampp/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples stlport"
+IUSE="examples"
 
-RDEPEND="virtual/fam
-	stlport? ( dev-libs/STLport )
-	>=dev-libs/ferrisloki-2.0.3[stlport?]
-	>=dev-libs/libsigc++-2.6:2
+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"
@@ -47,8 +47,7 @@ src_configure() {
 		--disable-static \
 		--disable-glibtest \
 		--disable-gtktest \
-		--with-stlport="${EPREFIX}/usr/include/stlport" \
-		$(use_enable stlport) \
+		--disable-stlport \
 		$(use_with examples)
 }
 

diff --git a/dev-libs/fampp2/metadata.xml b/dev-libs/fampp2/metadata.xml
index 9d356aef781..37d3ef415f8 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>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-04-05 17:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-29 12:08 [gentoo-commits] repo/gentoo:master commit in: dev-libs/fampp2/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2016-09-27 21:28 David Seifert
2017-04-05 17:15 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox