diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-08-19 00:07:18 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-08-19 00:07:18 +0000 |
| commit | e11747fdb2436c7bc61f9e12169aa1dd5f662bfb (patch) | |
| tree | a9f3706c0ee6f0ed36b972623579e546b3969d37 /net-print | |
| parent | Marking amd64 stable, ack, forgot to commit? (diff) | |
| download | gentoo-2-e11747fdb2436c7bc61f9e12169aa1dd5f662bfb.tar.gz gentoo-2-e11747fdb2436c7bc61f9e12169aa1dd5f662bfb.tar.bz2 gentoo-2-e11747fdb2436c7bc61f9e12169aa1dd5f662bfb.zip | |
make gnutls mandatory because it does not work with openssl, thanks to Jari-Matti Mäkelä <jmjmak@utu.fi> and Bret Towe <magnade@gmail.com> in bug 138275
(Portage version: 2.1.1_pre5-r2)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 7 | ||||
| -rw-r--r-- | net-print/cups/cups-1.2.2.ebuild | 16 |
2 files changed, 10 insertions, 13 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 01c84b43fe62..3686081d799c 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-print/cups # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.195 2006/08/18 22:27:38 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.196 2006/08/19 00:07:18 genstef Exp $ + + 19 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild: + make gnutls mandatory because it does not work with openssl, thanks to + Jari-Matti Mäkelä <jmjmak@utu.fi> and Bret Towe <magnade@gmail.com> in bug + 138275 18 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.1.23-r8.ebuild, cups-1.2.2.ebuild: diff --git a/net-print/cups/cups-1.2.2.ebuild b/net-print/cups/cups-1.2.2.ebuild index afa4361d2480..d757081d0179 100644 --- a/net-print/cups/cups-1.2.2.ebuild +++ b/net-print/cups/cups-1.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.4 2006/08/18 22:27:38 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.5 2006/08/19 00:07:18 genstef Exp $ inherit autotools eutils flag-o-matic multilib pam @@ -14,13 +14,10 @@ SRC_URI="http://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ssl slp pam samba nls gnutls dbus tiff png ppds jpeg X" +IUSE="ssl slp pam samba nls dbus tiff png ppds jpeg X" DEP="pam? ( virtual/pam ) - ssl? ( - !gnutls? ( >=dev-libs/openssl-0.9.6b ) - gnutls? ( net-libs/gnutls ) - ) + ssl? ( net-libs/gnutls ) slp? ( >=net-libs/openslp-1.0.4 ) dbus? ( sys-apps/dbus ) png? ( >=media-libs/libpng-1.2.1 ) @@ -80,11 +77,6 @@ src_unpack() { } src_compile() { - local myconf - - use ssl && \ - myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)" - export DSOFLAGS="${LDFLAGS}" econf \ --with-cups-user=lp \ @@ -95,6 +87,7 @@ src_compile() { --with-bindnow=$(bindnow-flags) \ $(use_enable pam) \ $(use_enable ssl) \ + --enable-gnutls \ $(use_enable slp) \ $(use_enable nls) \ $(use_enable dbus) \ @@ -105,7 +98,6 @@ src_compile() { --enable-threads \ --enable-static \ --disable-pdftops \ - ${myconf} \ || die "econf failed" # Install in /usr/libexec always, instead of using /usr/lib/cups, as that |