diff options
author | Hanno Böck <hanno@gentoo.org> | 2009-05-22 21:58:51 +0000 |
---|---|---|
committer | Hanno Böck <hanno@gentoo.org> | 2009-05-22 21:58:51 +0000 |
commit | c405fe720c6a6a0c2a5ab07814efce1c2641d733 (patch) | |
tree | 5b5e395003ad163298f62540aa18fc21c151f415 /sys-libs | |
parent | Use the system libraries instead of the bundled ones (diff) | |
download | gentoo-2-c405fe720c6a6a0c2a5ab07814efce1c2641d733.tar.gz gentoo-2-c405fe720c6a6a0c2a5ab07814efce1c2641d733.tar.bz2 gentoo-2-c405fe720c6a6a0c2a5ab07814efce1c2641d733.zip |
gwenhywfar bump
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/gwenhywfar/ChangeLog | 11 | ||||
-rw-r--r-- | sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-asneeded.diff | 14 | ||||
-rw-r--r-- | sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-gcc-check.diff | 16 | ||||
-rw-r--r-- | sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-gnutls-check.diff | 26 | ||||
-rw-r--r-- | sys-libs/gwenhywfar/gwenhywfar-3.8.1.ebuild | 51 |
5 files changed, 117 insertions, 1 deletions
diff --git a/sys-libs/gwenhywfar/ChangeLog b/sys-libs/gwenhywfar/ChangeLog index 487b13d68b50..90f2520eb95f 100644 --- a/sys-libs/gwenhywfar/ChangeLog +++ b/sys-libs/gwenhywfar/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-libs/gwenhywfar # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/ChangeLog,v 1.64 2009/04/05 16:55:23 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/ChangeLog,v 1.65 2009/05/22 21:58:51 hanno Exp $ + +*gwenhywfar-3.8.1 (22 May 2009) + + 22 May 2009; Hanno Boeck <hanno@gentoo.org> +gwenhywfar-3.8.1.ebuild, + +files/gwenhywfar-3.8.1-asneeded.diff, + +files/gwenhywfar-3.8.1-gcc-check.diff, + +files/gwenhywfar-3.8.1-gnutls-check.diff: + Version bump, patches for as-needed, gcc4-check in configure script and + gnutls 2.7. *gwenhywfar-3.8.0 (05 Apr 2009) diff --git a/sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-asneeded.diff b/sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-asneeded.diff new file mode 100644 index 000000000000..a58e06e04560 --- /dev/null +++ b/sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-asneeded.diff @@ -0,0 +1,14 @@ +Index: gwenhywfar-3.7.2/configure.ac +=================================================================== +--- gwenhywfar-3.7.2.orig/configure.ac ++++ gwenhywfar-3.7.2/configure.ac +@@ -204,7 +204,7 @@ AC_CHECK_LIB(rt, sem_init, + [ +- rt_libs="-lrt" ++ rt_libs="-lrt -pthread" + AC_DEFINE(HAVE_LIBRT, "1", [whether librt is available]) +- ]) ++ ], [], [-pthread]) + AC_SUBST(rt_libs) + + # Some systems have iconv in libc, some have it in libiconv (OSF/1 and diff --git a/sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-gcc-check.diff b/sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-gcc-check.diff new file mode 100644 index 000000000000..2e1736a8420f --- /dev/null +++ b/sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-gcc-check.diff @@ -0,0 +1,16 @@ +--- gwenhywfar-3.8.1/configure.ac 2009-05-09 18:08:48.000000000 +0200 ++++ gwenhywfar-3.8.1-1/configure.ac 2009-05-12 10:33:00.000000000 +0200 +@@ -844,11 +844,11 @@ + if test "$enable_visibility" = "yes"; then + AC_MSG_CHECKING(if symbol visibility is supported) + visibility_cflags="" +- case `basename $CC` in ++ case `$CC --version|head -n1|cut -f1 -d " "` in + gcc*) + dnl Determine version number (watch out: the outside square + dnl parenteses are vitally important here!) +- gccversion=["` ${CC} --version | head -1 | ${SED} 's/.*\([0-9]\.[0-9]\.[0-9]*\).*/\1/' `"] ++ gccversion=["` ${CC} -dumpversion `"] + case $gccversion in + 4.*) + # Activate -fvisibility=hidden only for explicit 4.x gcc diff --git a/sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-gnutls-check.diff b/sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-gnutls-check.diff new file mode 100644 index 000000000000..7958066cec50 --- /dev/null +++ b/sys-libs/gwenhywfar/files/gwenhywfar-3.8.1-gnutls-check.diff @@ -0,0 +1,26 @@ +Index: configure.ac +=================================================================== +--- configure.ac (Revision 1547) ++++ configure.ac (Arbeitskopie) +@@ -192,7 +192,6 @@ + AC_CHECK_PROG(USE_DOT,dot,YES,NO) + AC_CHECK_PROG(SED,sed,sed) + +- + ###------------------------------------------------------------------------- + # + # Checks for libraries. +@@ -604,12 +603,7 @@ + ;; + + *) +- AM_PATH_LIBGNUTLS([], [have_gnutls="yes"], [have_gnutls="no"]) +- if test "$have_gnutls" != "yes"; then +- AC_MSG_ERROR([ +- **** Libgnutls is required for Gwenhywfar. Please install it (including devel packages)]) +- fi +- ++ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls]) + # check for 1.6 or higher + oldlibs="$LIBS" + LIBS="${LIBGNUTLS_LIBS}" diff --git a/sys-libs/gwenhywfar/gwenhywfar-3.8.1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-3.8.1.ebuild new file mode 100644 index 000000000000..7d4aa9828a34 --- /dev/null +++ b/sys-libs/gwenhywfar/gwenhywfar-3.8.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-3.8.1.ebuild,v 1.1 2009/05/22 21:58:51 hanno Exp $ + +EAPI="2" + +inherit autotools + +DESCRIPTION="A multi-platform helper library for other libraries" +HOMEPAGE="http://gwenhywfar.sourceforge.net" +SRC_URI="http://www2.aquamaniac.de/sites/download/download.php?package=01&release=22&file=01&dummy=${P}.tar.gz -> ${P}.tar.gz" +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" + +IUSE="debug ssl doc" + +RDEPEND="ssl? ( net-libs/gnutls )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +src_prepare() { + epatch "${FILESDIR}/gwenhywfar-3.8.1-asneeded.diff" || die "epatch failed" + epatch "${FILESDIR}/gwenhywfar-3.8.1-gcc-check.diff" || die "epatch failed" + epatch "${FILESDIR}/gwenhywfar-3.8.1-gnutls-check.diff" || die "epatch failed" + eautoreconf || die +} + +src_configure() { + econf --enable-visibility \ + $(use_enable ssl) \ + $(use_enable debug) \ + $(use_enable doc full-doc) \ + --with-docpath="/usr/share/doc/${PF}/apidoc" || die "configure failed" +} + +src_compile() { + emake || die "emake failed" + if use doc ; then + emake srcdoc || die "emake failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + dodoc README* AUTHORS ChangeLog TODO || die "dodoc failed" + if use doc ; then + make DESTDIR="${D}" install-srcdoc || die "install doc failed" + fi + find "${D}" -name '*.la' -delete +} |