diff options
| -rw-r--r-- | x11-plugins/wmbiff/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch | 26 | ||||
| -rw-r--r-- | x11-plugins/wmbiff/wmbiff-0.4.27.ebuild | 22 |
3 files changed, 49 insertions, 8 deletions
diff --git a/x11-plugins/wmbiff/ChangeLog b/x11-plugins/wmbiff/ChangeLog index 48db17746eaf..ac762b9545c0 100644 --- a/x11-plugins/wmbiff/ChangeLog +++ b/x11-plugins/wmbiff/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-plugins/wmbiff -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.28 2008/01/06 21:22:11 drac Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.29 2010/06/20 12:48:56 ssuominen Exp $ + + 20 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> wmbiff-0.4.27.ebuild, + +files/wmbiff-0.4.27-gnutls.patch: + Use pkg-config instead of libgnutls-config wrt #268502 by Arfrever Frehtes + Taifersar Arahesis. 06 Jan 2008; Samuli Suominen <drac@gentoo.org> -wmbiff-0.4.25.ebuild, -wmbiff-0.4.25-r1.ebuild, wmbiff-0.4.27.ebuild: diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch new file mode 100644 index 000000000000..738d8f160a7a --- /dev/null +++ b/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch @@ -0,0 +1,26 @@ +http://bugs.gentoo.org/268502 + +--- configure.ac ++++ configure.ac +@@ -77,13 +77,14 @@ + + GNUTLS_MAN_STATUS="This copy of WMBiff was not compiled with GNUTLS." + if test "$gnutls" = "ok"; then +- AM_PATH_LIBGNUTLS(1.0.4, [LIBS="$LIBS $LIBGNUTLS_LIBS" +- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" +- CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS" +- GNUTLS_COMMON_O="gnutls-common.o" +- GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS." +- AC_CHECK_HEADERS(gnutls/gnutls.h) ], +- [ echo GNUTLS can be found at ftp://gnutls.hellug.gr/pub/gnutls ]) ++ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.4], ++ [LIBS="$LIBS $LIBGNUTLS_LIBS" ++ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" ++ CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS" ++ GNUTLS_COMMON_O="gnutls-common.o" ++ GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS." ++ AC_CHECK_HEADERS(gnutls/gnutls.h) ], ++ [ echo GNUTLS can be found at ftp://gnutls.hellug.gr/pub/gnutls ]) + else + AC_MSG_RESULT(GNUTLS support requires libz.a and libgdbm.a, so will be disabled) + fi diff --git a/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild index 93ba9aec940a..331d53a8f834 100644 --- a/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild +++ b/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild @@ -1,6 +1,9 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild,v 1.7 2008/01/06 21:22:11 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild,v 1.8 2010/06/20 12:48:56 ssuominen Exp $ + +EAPI=2 +inherit autotools eutils DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes." HOMEPAGE="http://sourceforge.net/projects/wmbiff/" @@ -17,15 +20,22 @@ RDEPEND="x11-libs/libX11 crypt? ( >=net-libs/gnutls-1.2.3 >=dev-libs/libgcrypt-1.2.1 )" DEPEND="${RDEPEND} + dev-util/pkgconfig x11-proto/xproto x11-proto/xextproto" -src_compile() { - econf $(use_enable crypt crypto) - emake || die "emake failed." +src_prepare() { + epatch "${FILESDIR}"/${P}-gnutls.patch + sed -i -e '/AC_PATH_XTRA_CORRECTED/d' configure.ac || die + eautoreconf +} + +src_configure() { + econf \ + $(use_enable crypt crypto) } src_install() { - emake DESTDIR="${D}" install || die "emake install failed." + emake DESTDIR="${D}" install || die dodoc ChangeLog FAQ NEWS README README.licq TODO wmbiff/sample.wmbiffrc } |