From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-libs/fampp2/Manifest | 8 +++ dev-libs/fampp2/fampp2-7.0.1-r3.ebuild | 59 ++++++++++++++++ .../files/fampp2-7.0.1-fix-buildsystem.patch | 78 ++++++++++++++++++++++ dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch | 67 +++++++++++++++++++ .../fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch | 46 +++++++++++++ dev-libs/fampp2/metadata.xml | 11 +++ 6 files changed, 269 insertions(+) create mode 100644 dev-libs/fampp2/Manifest create mode 100644 dev-libs/fampp2/fampp2-7.0.1-r3.ebuild create mode 100644 dev-libs/fampp2/files/fampp2-7.0.1-fix-buildsystem.patch create mode 100644 dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch create mode 100644 dev-libs/fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch create mode 100644 dev-libs/fampp2/metadata.xml (limited to 'dev-libs/fampp2') diff --git a/dev-libs/fampp2/Manifest b/dev-libs/fampp2/Manifest new file mode 100644 index 000000000000..99199b446697 --- /dev/null +++ b/dev-libs/fampp2/Manifest @@ -0,0 +1,8 @@ +AUX fampp2-7.0.1-fix-buildsystem.patch 1882 SHA256 ada43a1061aabfee9568103ca07b8b580f04d7a0716a2f75870cde96fe3027fd SHA512 00241839c238d772803dc095e1eaa81eadf9451f2c8a783d4d5acbcaa82b755d00e6ec6bdb2a6e621427e10a0f0674d92186b58bb28a708c3f714200b626caa4 WHIRLPOOL 7ea7e85917793da967449c2a4d5fd87a141fdc379f84ac6263ddc3d142f6b4bb9329f54f9fc41552689d4fb6857c9aa0717ca9be1aba66d44a3edbf792ea6325 +AUX fampp2-7.0.1-fix-gcc6.patch 1514 SHA256 49c63d66280f80d565b374ef9dd9ad0305800a2f6cce0862c6e6bd250cbc750c SHA512 2c41ecae31cb6bb5df861cd56f0898e9dcf4f5d71f1b25462989548847e4bf7b0f96dc1b53a139dc6b72a251e283e2e7f540dd751f045bc06061193f4b4787cb WHIRLPOOL baaf816084e32243c9b515a426da9c986ac9cb26519e00c040814e5394af5ad3e5d525974816a40b09630d9c329d2f878207236069ef7ab8078f02a131d1ff07 +AUX fampp2-7.0.1-libsigc++-2.6.patch 1041 SHA256 9476c03c01309569874e7e8e4b6b564d76e49e27cd4599561556b86b165515b1 SHA512 6139c238551b4dd8396ed7df23353245b7668a27c109da3f720acc582d6b08d0b6f3227924ea8ca4c101706eae9036aa84f7f5ecd91c41f0f54d700a73a49b55 WHIRLPOOL d2b48a3d118f73231531ccfde3d079a847a38c5d2fbfd8c3c0ad0b832c67718a5d6c1266b05e83a7abc8704354de8ca0b7cd5da16b9201e7678820b4818462d0 +DIST fampp2-7.0.1.tar.bz2 288073 SHA256 2bfcc28755dbec832b395bad63b8cf40896b0d4bfbca02c57477a164ca2f0244 SHA512 317a5cfd383418265cafea0840af8b7c714a04b34265ebfba73230ff2492df8f7884797529916693ab489bdbc94799ca83e015cf0bcfffaea6b28b3a7f9ccbd0 WHIRLPOOL 513b6c9f42f9fdacb089079420212d5f79394aec339061d5edd0e7faa34e0b20f33ae98258771a9d60f958683f8bdb6cedae4cd1067f76266f7ee79053b0d9a7 +EBUILD fampp2-7.0.1-r3.ebuild 1234 SHA256 c5cee9fbac36a31abafe16965b03f0cb57698d1aa526ff28bb696597fda5a5f7 SHA512 51f1696cf3eb0e5efde0bfa586e0f6e99afb2b06ec1beaa4f9d222ffc92655dcea14e1a5e3feaa6a4cd4097d6f764e06a155dac739971ff3debf66b2daefc789 WHIRLPOOL 93fea74dd1e83164d9e1021ecba302bfa9ff31f54fba6331bfa382b5a38bd4c1e80c95f6e988c720e62370c6c339d362ed62d4ae6e1fa464b6e534fbd313c275 +MISC ChangeLog 3759 SHA256 c168490a0c0b9c99f9c517e070ca70cc6b7e3a1b35751b5bf8416d44687f8d14 SHA512 bf1a987c530ddf98c095d02e0b0394f85ab1a74ed869865eee4678651770075452845f4809f22f657ab6f2d0dbbf4cbb3d88f9d3a11de71212881f60107214a9 WHIRLPOOL 85c056f702f81fa73ba20a4821202c7aecdf69eadd7b8082592c5f25969daac476c36a7309afeefb3f34838881d26e17aca641dfffe166c48bb017766c46d0de +MISC ChangeLog-2015 1476 SHA256 13b5de15344dbff68824b25ab33785cb3673556469f58eeafe8c80a65921fe71 SHA512 38f22ff6d498407777e13850458007e2ca508ac0fa1f4e9a6a2bf13ad97a636ad5115effff56f7f997bcdad2c01277086e791686d9a4098af7f86e4a9b042a5f WHIRLPOOL 9fd08c6f2dc4580a9af71b7d750d90d7b02801bb21e06c2bf6f27951b8fb10b78e4ad8906a12aec927646c27f4919469c6b41664cc1323968af0e02d58a33b0b +MISC metadata.xml 324 SHA256 0000da52b593821a16fec8c69b259c8fcef706ca184ad905f702de0943a3485e SHA512 c87cbdc39f88103e6ebb534a0c65a3ea4ae784a198a5286c7d43d935386588a7900e27894b9f6d552fd199b4c4fc2fa7daad7624145976cc8c82f61ddd327fc0 WHIRLPOOL 56abfba3521a70e43caa7743790956cdbe2d1d68f62bf8546d32ba82f119a0eddc1cf41e4f5f214a5fc5dd0372ef122362406aa2a79094d8ee741bf0b6ff05c8 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/files/fampp2-7.0.1-fix-buildsystem.patch b/dev-libs/fampp2/files/fampp2-7.0.1-fix-buildsystem.patch new file mode 100644 index 000000000000..34067ff1f539 --- /dev/null +++ b/dev-libs/fampp2/files/fampp2-7.0.1-fix-buildsystem.patch @@ -0,0 +1,78 @@ +Fix buildsystem, to avoid ugly and extremely brittle patching +of the configure script and Makefile.in in the main ebuild. + +--- a/configure.in ++++ b/configure.in +@@ -1,8 +1,8 @@ ++AC_PREREQ([2.69]) ++AC_INIT([fampp2],[7.0.1]) + +-# require autoconf 2.13 +-AC_PREREQ(2.13) +- +-AC_INIT(src/Fampp2.hh) ++AC_CONFIG_MACRO_DIR([macros]) ++AC_CONFIG_SRCDIR([src/Fampp2.hh]) + + FAMPPTWO_MAJOR=7 + FAMPPTWO_MINOR=0 +@@ -22,9 +22,8 @@ + VERSION=$FAMPP_VERSION + PACKAGE=fampp2 + +-AM_CONFIG_HEADER(config.h) +-AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +-AM_MAINTAINER_MODE ++AC_CONFIG_HEADERS([config.h]) ++AM_INIT_AUTOMAKE + + AC_CANONICAL_HOST + AC_ISC_POSIX +@@ -33,11 +32,7 @@ + AC_PROG_CPP + AC_PROG_CXX + +-AC_STDC_HEADERS +-#AC_ARG_PROGRAM +-AC_DISABLE_FAST_INSTALL +-AC_DISABLE_STATIC +-AM_PROG_LIBTOOL ++LT_INIT + + + dnl Checks for libraries. +@@ -58,15 +53,12 @@ + ############################################################################### + + +-CFLAGS=" $STLPORT_CFLAGS $LOKI_CFLAGS $SIGC_CFLAGS $CFLAGS -O0 -g " +-CXXFLAGS=" $STLPORT_CFLAGS $CXXFLAGS -O0 -g $LOKI_LIBS $SIGC_CFLAGS " +-LDFLAGS=" $STLPORT_LIBS $SIGC_LIBS $LDFLAGS -Wl,-O1 -Wl,--hash-style=both" +-AC_SUBST(CFLAGS) +-AC_SUBST(CPPFLAGS) +-AC_SUBST(LDFLAGS) +-AC_SUBST(CXXFLAGS) +-AC_SUBST(CXXCPPFLAGS) ++CFLAGS="${CFLAGS} ${STLPORT_CFLAGS} ${LOKI_CFLAGS} ${SIGC_CFLAGS}" ++CXXFLAGS="${CXXFLAGS} ${STLPORT_CFLAGS} ${LOKI_CFLAGS} ${SIGC_CFLAGS}" ++LIBS="${LIBS} ${STLPORT_LIBS} ${LOKI_LIBS} ${SIGC_LIBS}" + ++AC_ARG_WITH([examples], [install examples]) ++AM_CONDITIONAL([EXAMPLES], [test "x$with_examples" = "xyes"]) + + dnl if test "x${prefix}" = 'xNONE'; then + dnl prefix=${ac_default_prefix}; +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,10 @@ + AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects + + NULL= +-SUBDIRS = src examples ++SUBDIRS = src ++if EXAMPLES ++SUBDIRS += examples ++endif + + EXTRA_DIST = fampp.spec fampp.spec.in fampp2.pc.in fampp2.pc + diff --git a/dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch b/dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch new file mode 100644 index 000000000000..659ecd51bf4c --- /dev/null +++ b/dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch @@ -0,0 +1,67 @@ +C++11 changed destructor semantics to be noexcept(true) +by default, leading to potentially changed semantics. +See also: https://bugs.gentoo.org/show_bug.cgi?id=595308 + +--- a/src/Fampp2.cpp ++++ b/src/Fampp2.cpp +@@ -105,6 +105,9 @@ + // #include + + FamppRequest::~FamppRequest() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif + { + // cerr << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl; + // cerr << "FamppRequest::~FamppRequest() this:" << (void*)this << endl; +@@ -245,6 +248,9 @@ + + + FamppImplMethods::~FamppImplMethods() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif + { + if(0 != FAMClose( &theFAMConnection )) { + throw FamppCloseFailedException(); +--- a/src/Fampp2.hh ++++ b/src/Fampp2.hh +@@ -168,7 +168,11 @@ + public: + + +- ~FamppRequest(); ++ ~FamppRequest() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif ++ ; + + + void suspend(); +@@ -216,7 +220,11 @@ + protected: + + FamppImplMethods(); +- virtual ~FamppImplMethods(); ++ virtual ~FamppImplMethods() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif ++ ; + + + public: +@@ -251,7 +259,11 @@ + public: + FamppSingletonClass(); + FamppSingletonClass(const std::string appName); +- ~FamppSingletonClass(); ++ ~FamppSingletonClass() ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif ++ ; + + + void NextEvent(); diff --git a/dev-libs/fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch b/dev-libs/fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch new file mode 100644 index 000000000000..6b76a1532cbb --- /dev/null +++ b/dev-libs/fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch @@ -0,0 +1,46 @@ +Remove inclusion of libsigc++ headers obsoleted with version 2.6 +See also: https://bugs.gentoo.org/show_bug.cgi?id=569700 + +--- a/examples/console_test/famppct.cpp ++++ b/examples/console_test/famppct.cpp +@@ -30,8 +30,6 @@ + + #include + #include +-#include +-#include + + #include + #include +--- a/examples/gtk/famppgtk.cpp ++++ b/examples/gtk/famppgtk.cpp +@@ -31,8 +31,6 @@ + + #include + #include +-#include +-#include + + #include + #include +--- a/src/Fampp2.cpp ++++ b/src/Fampp2.cpp +@@ -34,8 +34,6 @@ + + #include + #include +-#include +-#include + + + using namespace std; +--- a/src/FamppEvents.hh ++++ b/src/FamppEvents.hh +@@ -36,7 +36,6 @@ + + #include + #include +-#include + #include + #include + #include diff --git a/dev-libs/fampp2/metadata.xml b/dev-libs/fampp2/metadata.xml new file mode 100644 index 000000000000..37d3ef415f8a --- /dev/null +++ b/dev-libs/fampp2/metadata.xml @@ -0,0 +1,11 @@ + + + + + cpp@gentoo.org + Gentoo C++ Project + + + fampp + + -- cgit v1.2.3