From e9ae83eebf72fcf5acdeb36050b8627e8ab260ee Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Sat, 6 May 2006 19:20:41 +0000 Subject: Fix SERVERBIN path and fix multilib-strictness. Add optional dbus useflag. Package-Manager: portage-2.1_pre10-r3 --- net-print/cups/ChangeLog | 5 ++++- net-print/cups/Manifest | 22 +++++++++++----------- net-print/cups/cups-1.2.0_pre.ebuild | 22 ++++++++++++++-------- 3 files changed, 29 insertions(+), 20 deletions(-) (limited to 'net-print') diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index a65d61d4c7e1..d45c413a41f0 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,9 @@ # 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.162 2006/05/05 05:28:53 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.163 2006/05/06 19:20:41 flameeyes Exp $ + + 06 May 2006; Diego Pettenò cups-1.2.0_pre.ebuild: + Fix SERVERBIN path and fix multilib-strictness. Add optional dbus useflag. *cups-1.2.0_pre (05 May 2006) diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 87ae9abe8c60..ad7fe5d7655a 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -70,14 +70,14 @@ EBUILD cups-1.1.23-r7.ebuild 4608 RMD160 632e6dd43be3eb0c12ea172492b5b39902c9f9e MD5 bf5afc4432a75abcd25c934233de0406 cups-1.1.23-r7.ebuild 4608 RMD160 632e6dd43be3eb0c12ea172492b5b39902c9f9e5 cups-1.1.23-r7.ebuild 4608 SHA256 40e886b9a539b594135464a3fd6a8b63000878e8b1b7e2ebc6d29b22ae6bbb35 cups-1.1.23-r7.ebuild 4608 -EBUILD cups-1.2.0_pre.ebuild 3217 RMD160 d0f957831a10b912865198376ea2edaa99563341 SHA1 9e4c2940ef4d4b0df5f11a5462d06207a9f467ac SHA256 675de258cc2d91fe12b0d24b3be3c7cdd0c54d100168086cc753ee93a7af5e75 size 3217 -MD5 4ee3df4bfcb1b9a286d435e6e5dd4297 cups-1.2.0_pre.ebuild 3217 -RMD160 d0f957831a10b912865198376ea2edaa99563341 cups-1.2.0_pre.ebuild 3217 -SHA256 675de258cc2d91fe12b0d24b3be3c7cdd0c54d100168086cc753ee93a7af5e75 cups-1.2.0_pre.ebuild 3217 -MISC ChangeLog 21523 RMD160 8b627d296839b76cef09fa4feffcd96a8057637c SHA1 2e0b8cb33484c8c3190159d579fff78e3dac5b1a SHA256 5f29d77194633c51a3d8139ea8f90925870905958bb61c2a0c6350bb0a197c1d size 21523 -MD5 cf19bbb78de2fae8502d812c228a4c48 ChangeLog 21523 -RMD160 8b627d296839b76cef09fa4feffcd96a8057637c ChangeLog 21523 -SHA256 5f29d77194633c51a3d8139ea8f90925870905958bb61c2a0c6350bb0a197c1d ChangeLog 21523 +EBUILD cups-1.2.0_pre.ebuild 3589 RMD160 291b4743ab69728c97053bf9e3b5cebfba4aa7af SHA1 04da345974d7568b700130f6b745c2259b611629 SHA256 22996a5584f05191d4e9695a3104e5e0fe3e6972fb0b2e56770817ba1fb4dbd3 size 3589 +MD5 251320e1fdf23601dee7f078ad74b3c1 cups-1.2.0_pre.ebuild 3589 +RMD160 291b4743ab69728c97053bf9e3b5cebfba4aa7af cups-1.2.0_pre.ebuild 3589 +SHA256 22996a5584f05191d4e9695a3104e5e0fe3e6972fb0b2e56770817ba1fb4dbd3 cups-1.2.0_pre.ebuild 3589 +MISC ChangeLog 21679 RMD160 d342189c021c718d738b59b39f81fe979654b568 SHA1 db1d54a26e4ce25265c14ab55e1f2a70fffa275c SHA256 b1fb8f02a3f41a50460ca8cd86a46fed76cc56ca82b3587345323e439dc37f3c size 21679 +MD5 45110c6bc129a5237e32ef88fe4ab698 ChangeLog 21679 +RMD160 d342189c021c718d738b59b39f81fe979654b568 ChangeLog 21679 +SHA256 b1fb8f02a3f41a50460ca8cd86a46fed76cc56ca82b3587345323e439dc37f3c ChangeLog 21679 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 size 161 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 @@ -97,7 +97,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEWuKiNJowsmZ/PzARAgdDAJ0QMva16j1kTl0nKtbcsU2Tgx2wdACdGElG -nuE5o2oNKWiP65Gmf97VefY= -=3m/t +iD8DBQFEXPcWAiZjviIA2XgRAmUhAKDsXlrrZ6rIv9POyYKrVtWZzwCJsQCdH0/T +SIU8ufFSjIwS6RXGu8SF/MI= +=CmIN -----END PGP SIGNATURE----- diff --git a/net-print/cups/cups-1.2.0_pre.ebuild b/net-print/cups/cups-1.2.0_pre.ebuild index 88c382930bc8..44252d19c0a3 100644 --- a/net-print/cups/cups-1.2.0_pre.ebuild +++ b/net-print/cups/cups-1.2.0_pre.ebuild @@ -1,8 +1,8 @@ # 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.0_pre.ebuild,v 1.1 2006/05/05 05:28:54 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.0_pre.ebuild,v 1.2 2006/05/06 19:20:41 flameeyes Exp $ -inherit eutils flag-o-matic pam autotools subversion +inherit eutils flag-o-matic pam autotools multilib subversion MY_P=${P/_/} @@ -16,7 +16,7 @@ ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ssl slp pam samba nls gnutls" +IUSE="ssl slp pam samba nls gnutls dbus" DEP="pam? ( virtual/pam ) ssl? ( @@ -24,6 +24,7 @@ DEP="pam? ( virtual/pam ) gnutls? ( net-libs/gnutls ) ) slp? ( >=net-libs/openslp-1.0.4 ) + dbus? ( sys-apps/dbus ) >=media-libs/libpng-1.2.1 >=media-libs/tiff-3.5.5 >=media-libs/jpeg-6b" @@ -44,17 +45,16 @@ pkg_setup() { } src_compile() { + # cups does not use autotools "the usual way" and ship a static config.h.in eaclocal - _elibtoolize --copy --force eautoconf - eautomake - elibtoolize + local myconf use ssl && \ myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)" - setenv DSOFLAGS ${LDFLAGS} + export DSOFLAGS="${LDFLAGS}" econf \ --with-cups-user=lp \ --with-cups-group=lp \ @@ -64,6 +64,7 @@ src_compile() { $(use_enable ssl) \ $(use_enable slp) \ $(use_enable nls) \ + $(use_enable dbus) \ --enable-libpaper \ --enable-threads \ --enable-static \ @@ -71,6 +72,9 @@ src_compile() { ${myconf} \ || die "econf failed" + sed -i -e 's:SERVERBIN.*:SERVERBIN = $(BUILDROOT)/usr/'$(get_libdir)'/cups:' Makedefs + sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/'$(get_libdir)'/cups":' config.h + emake || die "emake failed" } @@ -97,8 +101,10 @@ src_install() { pamd_mimic_system cups auth account + sed -i -e "s:/usr/lib/cups:/usr/$(get_libdir)/cups:" ${D}/etc/xinetd.d/cups-lpd + # install pdftops filter - exeinto /usr/lib/cups/filter/ + exeinto /usr/$(get_libdir)/cups/filter/ newexe ${FILESDIR}/pdftops.pl pdftops fowners lp:lp /var/log/cups /var/run/cups/certs /var/cache/cups \ -- cgit v1.2.3-65-gdbad