From b4ba0b869c09ba3a011c96dba378f5be000ce68c Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Fri, 13 Jul 2012 11:08:03 +0000 Subject: Fix header for gcc 4.7 (bug #425110) (Portage version: 2.2.0_alpha117/cvs/Linux x86_64) --- dev-cpp/libassa/ChangeLog | 12 +++++-- .../files/libassa-3.5.0-dont-run-ldconfig.patch | 21 ------------ dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch | 28 --------------- dev-cpp/libassa/files/libassa-3.5.0-ldflags.patch | 13 ------- .../files/libassa-3.5.0-link-dynamically.patch | 15 -------- dev-cpp/libassa/files/libassa-3.5.1-gcc47.patch | 12 +++++++ dev-cpp/libassa/libassa-3.5.0.ebuild | 40 ---------------------- dev-cpp/libassa/libassa-3.5.1-r1.ebuild | 37 ++++++++++++++++++++ 8 files changed, 59 insertions(+), 119 deletions(-) delete mode 100644 dev-cpp/libassa/files/libassa-3.5.0-dont-run-ldconfig.patch delete mode 100644 dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch delete mode 100644 dev-cpp/libassa/files/libassa-3.5.0-ldflags.patch delete mode 100644 dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch create mode 100644 dev-cpp/libassa/files/libassa-3.5.1-gcc47.patch delete mode 100644 dev-cpp/libassa/libassa-3.5.0.ebuild create mode 100644 dev-cpp/libassa/libassa-3.5.1-r1.ebuild (limited to 'dev-cpp') diff --git a/dev-cpp/libassa/ChangeLog b/dev-cpp/libassa/ChangeLog index eb56dd56be6c..c1249c508265 100644 --- a/dev-cpp/libassa/ChangeLog +++ b/dev-cpp/libassa/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-cpp/libassa # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/ChangeLog,v 1.17 2012/05/27 07:29:17 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/ChangeLog,v 1.18 2012/07/13 11:08:03 angelos Exp $ + +*libassa-3.5.1-r1 (13 Jul 2012) + + 13 Jul 2012; Christoph Mende + +files/libassa-3.5.1-gcc47.patch, +libassa-3.5.1-r1.ebuild, + -files/libassa-3.5.0-dont-run-ldconfig.patch, + -files/libassa-3.5.0-gcc44.patch, -files/libassa-3.5.0-ldflags.patch, + -files/libassa-3.5.0-link-dynamically.patch, -libassa-3.5.0.ebuild: + Fix header for gcc 4.7 (bug #425110) 27 May 2012; Christoph Mende libassa-3.5.1.ebuild: Stable on amd64 (bug #417691) @@ -64,4 +73,3 @@ 11 Sep 2007; Christoph Mende +libassa-3.4.2.ebuild: Initial import - diff --git a/dev-cpp/libassa/files/libassa-3.5.0-dont-run-ldconfig.patch b/dev-cpp/libassa/files/libassa-3.5.0-dont-run-ldconfig.patch deleted file mode 100644 index fcc6042b057c..000000000000 --- a/dev-cpp/libassa/files/libassa-3.5.0-dont-run-ldconfig.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 508d13e..2cd704e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -40,16 +40,3 @@ MAINTAINERCLEANFILES = \ - *.log core FILE *~ Makefile.in configure config.h.in \ - config.status aclocal.m4 config.guess config.sub \ - depcomp install-sh mkinstalldirs missing -- -- --# Run ldconfig after installing the library: --# --# '-ldconfig' expands into 'PATH="$PATH:/sbin" ldconfig -n /usr/local/bin' --# --# Somehow, this doen't work. --# --install-exec-hook: -- -ldconfig -- --uninstall-hook: -- -ldconfig diff --git a/dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch b/dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch deleted file mode 100644 index 02e3f9232a8c..000000000000 --- a/dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch +++ /dev/null @@ -1,28 +0,0 @@ -For va_list in gcc 4.4+ and glibc system stdarg.h is always required. For gcc 4.4+ including stdio.h -is required because of headers clean up. - -Patch by Samuli Suominen - -diff -ur libassa-3.5.0.orig/assa/Logger_Impl.cpp libassa-3.5.0/assa/Logger_Impl.cpp ---- libassa-3.5.0.orig/assa/Logger_Impl.cpp 2006-07-20 05:30:54.000000000 +0300 -+++ libassa-3.5.0/assa/Logger_Impl.cpp 2009-09-04 13:26:26.000000000 +0300 -@@ -14,6 +14,7 @@ - - #include - #include -+#include // vsnprintf(3) - #include // strerror(3) - - #include "assa/TimeVal.h" -diff -ur libassa-3.5.0.orig/assa/Logger_Impl.h libassa-3.5.0/assa/Logger_Impl.h ---- libassa-3.5.0.orig/assa/Logger_Impl.h 2006-07-20 05:30:54.000000000 +0300 -+++ libassa-3.5.0/assa/Logger_Impl.h 2009-09-04 13:29:45.000000000 +0300 -@@ -21,7 +21,7 @@ - #include // va_list - #endif - --#if defined (__CYGWIN32__) || defined (__NetBSD__) || defined (WIN32) -+#if defined (__CYGWIN32__) || defined (__NetBSD__) || defined (WIN32) || defined (__GLIBC__) - # include - #endif - diff --git a/dev-cpp/libassa/files/libassa-3.5.0-ldflags.patch b/dev-cpp/libassa/files/libassa-3.5.0-ldflags.patch deleted file mode 100644 index 22a65c1ea8dc..000000000000 --- a/dev-cpp/libassa/files/libassa-3.5.0-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/utils/Makefile.am b/utils/Makefile.am -index 3d95d22..82c2345 100644 ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -15,7 +15,7 @@ noinst_PROGRAMS = bytereader - ASSADIR = ${top_srcdir}/assa - INCLUDES = -I$(top_srcdir) - --LDFLAGS = -static -+LDFLAGS += -static - LDADD = $(top_builddir)/assa/libassa-@ASSA_RELEASE@.la @WIN32_EXTRA_LIBADD@ - - bytereader_SOURCES = bytereader.cpp diff --git a/dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch b/dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch deleted file mode 100644 index 883fed474961..000000000000 --- a/dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/utils/Makefile.am b/utils/Makefile.am -index 82c2345..6550015 100644 ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -15,8 +15,8 @@ noinst_PROGRAMS = bytereader - ASSADIR = ${top_srcdir}/assa - INCLUDES = -I$(top_srcdir) - --LDFLAGS += -static --LDADD = $(top_builddir)/assa/libassa-@ASSA_RELEASE@.la @WIN32_EXTRA_LIBADD@ -+LDFLAGS += -L$(top_builddir)/assa/.libs -+LIBS = -lassa-3.5 - - bytereader_SOURCES = bytereader.cpp - diff --git a/dev-cpp/libassa/files/libassa-3.5.1-gcc47.patch b/dev-cpp/libassa/files/libassa-3.5.1-gcc47.patch new file mode 100644 index 000000000000..725636a3967c --- /dev/null +++ b/dev-cpp/libassa/files/libassa-3.5.1-gcc47.patch @@ -0,0 +1,12 @@ +diff --git a/assa/CommonUtils.h b/assa/CommonUtils.h +index 2db38d2..4db27f6 100644 +--- a/assa/CommonUtils.h ++++ b/assa/CommonUtils.h +@@ -16,6 +16,7 @@ + + #include + ++#include + #include + #include + using std::vector; diff --git a/dev-cpp/libassa/libassa-3.5.0.ebuild b/dev-cpp/libassa/libassa-3.5.0.ebuild deleted file mode 100644 index 86cee054a811..000000000000 --- a/dev-cpp/libassa/libassa-3.5.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/libassa-3.5.0.ebuild,v 1.10 2011/07/19 20:33:31 angelos Exp $ - -EAPI=3 -inherit autotools eutils - -DESCRIPTION="A networking library based on Adaptive Communication Patterns" -HOMEPAGE="http://libassa.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND="doc? ( app-doc/doxygen )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc44.patch \ - "${FILESDIR}"/${P}-dont-run-ldconfig.patch \ - "${FILESDIR}"/${P}-fix-tests.patch \ - "${FILESDIR}"/${P}-ldflags.patch \ - "${FILESDIR}"/${P}-link-dynamically.patch - AT_M4DIR="${S}/macros" - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable doc doxygen) -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" - find "${ED}" -name "*.la" -exec rm -rf {} + || die "failed to delete .la files" -} diff --git a/dev-cpp/libassa/libassa-3.5.1-r1.ebuild b/dev-cpp/libassa/libassa-3.5.1-r1.ebuild new file mode 100644 index 000000000000..83b25b491d3d --- /dev/null +++ b/dev-cpp/libassa/libassa-3.5.1-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/libassa-3.5.1-r1.ebuild,v 1.1 2012/07/13 11:08:03 angelos Exp $ + +EAPI=4 +inherit eutils + +DESCRIPTION="A networking library based on Adaptive Communication Patterns" +HOMEPAGE="http://libassa.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc static-libs" + +RDEPEND="net-libs/libtirpc" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.5.0-fix-tests.patch \ + "${FILESDIR}"/${P}-gcc47.patch +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_enable doc doxygen) +} + +src_install() { + default + find "${ED}" -name "*.la" -exec rm -rf {} + || die "failed to delete .la files" +} -- cgit v1.2.3-65-gdbad