diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2009-10-03 19:23:14 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2009-10-03 19:23:14 +0000 |
| commit | 806e5761d61a0346d1b4d9dc3a2412ad65b22803 (patch) | |
| tree | 49fcd9ce3c7106646a3d66e0861bada8c2ccc690 /app-admin | |
| parent | Bump to 2.2.0 (diff) | |
| download | gentoo-2-806e5761d61a0346d1b4d9dc3a2412ad65b22803.tar.gz gentoo-2-806e5761d61a0346d1b4d9dc3a2412ad65b22803.tar.bz2 gentoo-2-806e5761d61a0346d1b4d9dc3a2412ad65b22803.zip | |
Fix building with gnutls-2.8. Thanks to Robert Piasek <dagger AT gentoo DOT org> for the fix; bug #273616
(Portage version: 2.2_rc42/cvs/Linux i686)
Diffstat (limited to 'app-admin')
3 files changed, 31 insertions, 5 deletions
diff --git a/app-admin/prelude-manager/ChangeLog b/app-admin/prelude-manager/ChangeLog index f1c56ff4d7d9..bed3d0bdfd0c 100644 --- a/app-admin/prelude-manager/ChangeLog +++ b/app-admin/prelude-manager/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/prelude-manager # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/ChangeLog,v 1.56 2009/09/23 15:01:28 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/ChangeLog,v 1.57 2009/10/03 19:23:14 halcy0n Exp $ + + 02 Oct 2009; Mark Loeser <halcy0n@gentoo.org> + prelude-manager-0.9.15.ebuild, + +files/prelude-manager-0.9.15-use-pkg-config.patch: + Fix building with gnutls-2.8. Thanks to Robert Piasek <dagger AT gentoo + DOT org> for the fix; bug #273616 23 Sep 2009; Patrick Lauer <patrick@gentoo.org> prelude-manager-0.9.9.1.ebuild, prelude-manager-0.9.15.ebuild: diff --git a/app-admin/prelude-manager/files/prelude-manager-0.9.15-use-pkg-config.patch b/app-admin/prelude-manager/files/prelude-manager-0.9.15-use-pkg-config.patch new file mode 100644 index 000000000000..1e33230491f9 --- /dev/null +++ b/app-admin/prelude-manager/files/prelude-manager-0.9.15-use-pkg-config.patch @@ -0,0 +1,11 @@ +--- configure.in~ 2009-07-23 16:12:52.000000000 +0100 ++++ configure.in 2009-07-23 16:12:52.000000000 +0100 +@@ -76,7 +76,7 @@ + dnl ************************************************** + dnl * Check for GnuTLS. * + dnl ************************************************** +-AM_PATH_LIBGNUTLS(1.0.17, gnutls=yes, gnutls=no) ++PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.17, gnutls=yes, gnutls=no) + if test x$gnutls != xyes; then + AC_MSG_ERROR(libgnutls is required in order to build prelude-manager.) + fi diff --git a/app-admin/prelude-manager/prelude-manager-0.9.15.ebuild b/app-admin/prelude-manager/prelude-manager-0.9.15.ebuild index 8861f0082924..914358e5acce 100644 --- a/app-admin/prelude-manager/prelude-manager-0.9.15.ebuild +++ b/app-admin/prelude-manager/prelude-manager-0.9.15.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/prelude-manager-0.9.15.ebuild,v 1.3 2009/09/23 15:01:28 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/prelude-manager-0.9.15.ebuild,v 1.4 2009/10/03 19:23:14 halcy0n Exp $ -inherit flag-o-matic +inherit flag-o-matic eutils autotools DESCRIPTION="Prelude-IDS Manager" HOMEPAGE="http://www.prelude-ids.org/" @@ -16,13 +16,22 @@ IUSE="debug xml dbx tcpwrapper" RDEPEND="!dev-libs/libprelude-cvs !app-admin/prelude-manager-cvs >=dev-libs/libprelude-0.9.5 - dev-libs/openssl + net-libs/gnutls xml? ( dev-libs/libxml2 ) dbx? ( dev-libs/libpreludedb ) tcpwrapper? ( sys-apps/tcp-wrappers )" DEPEND="${RDEPEND} - >=sys-apps/sed-4" + >=sys-apps/sed-4 + dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/prelude-manager-0.9.15-use-pkg-config.patch + eautoreconf +} src_compile() { local myconf |