diff options
| -rw-r--r-- | x11-plugins/wmbiff/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-plugins/wmbiff/Manifest | 5 | ||||
| -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 |
4 files changed, 52 insertions, 10 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/Manifest b/x11-plugins/wmbiff/Manifest index 95b78eae51a8..0b40e11ab5eb 100644 --- a/x11-plugins/wmbiff/Manifest +++ b/x11-plugins/wmbiff/Manifest @@ -1,4 +1,5 @@ +AUX wmbiff-0.4.27-gnutls.patch 1156 RMD160 af2abaf2cd9461ebbb4e17d77696d674441831b9 SHA1 b3c9943267c05f5bf6a8d63ec63be792fe200cf6 SHA256 247184b962188f1fafccc568220675bf65077bad4a05e83186294bf05d10cbda DIST wmbiff-0.4.27.tar.gz 201713 RMD160 d1d8831967b0539d56eb0d77286442ebafb8a6b8 SHA1 2c84993d78e22b5061192412161bc27a2a1a3007 SHA256 c25b7b3d3a5ddbbfa9f85bb39f553f5bc001189fc624e6761d986369068d7da3 -EBUILD wmbiff-0.4.27.ebuild 904 RMD160 d6fde92b171b0d11a273da8eceddeac90e89317d SHA1 8167ce85eb6a1681ff53daebfefec8792f0a561f SHA256 36b26e5f65c350c8158da5ca1fc5185dcdd3d4f60bc9c2d08cf5c0912da2e321 -MISC ChangeLog 3618 RMD160 bde0cbade51e20ab873ce03347115135fd7457a0 SHA1 8e10ce0874f9fe9256dd483c753756aff072db77 SHA256 5b003d158682f9c1bdd69bb3a76cd2d2c42ee5eb4f3910fe5e94aedcee1ca5d5 +EBUILD wmbiff-0.4.27.ebuild 1045 RMD160 974177524b893372a45bbd1b462d34e4c8693224 SHA1 96ed9f492c9738257209e7baa0f28d0d9ac05474 SHA256 bf47d5f7e59bf310bbd7532408b0aec8be9726082011a898a0e32fe931c9cb00 +MISC ChangeLog 3836 RMD160 81b0321fd549e638253a6c52ccb36aaf2161a09d SHA1 3ddf2c47092b45cf6a1b6f6f69e8a7dfff51a525 SHA256 e6a2bf05e2cde5bfe5c40e4d6a529a3475f979ce27db24eb6815b30104cac9fd MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b 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 } |