diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-05-02 21:42:08 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-05-02 21:42:08 +0000 |
commit | 33951e36b3a663cf6cc070b1fe24555a995e0988 (patch) | |
tree | db4347f425ee60ce8f20f6bd88ef5baae3904581 /net-print | |
parent | dev-util/pkgconfig -> virtual/pkgconfig (diff) | |
download | gentoo-2-33951e36b3a663cf6cc070b1fe24555a995e0988.tar.gz gentoo-2-33951e36b3a663cf6cc070b1fe24555a995e0988.tar.bz2 gentoo-2-33951e36b3a663cf6cc070b1fe24555a995e0988.zip |
Add missing avahi dependencies, bug 414349.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'net-print')
-rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
-rw-r--r-- | net-print/cups/cups-1.5.2-r20.ebuild | 4 | ||||
-rw-r--r-- | net-print/cups/cups-1.5.2-r4.ebuild | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index ab8a5d69ab39..5394cf38edbd 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.468 2012/05/01 19:31:17 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.469 2012/05/02 21:42:08 dilfridge Exp $ + + 02 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r20.ebuild, + cups-1.5.2-r4.ebuild: + Add missing avahi dependencies, bug 414349. 01 May 2012; Jeroen Roovers <jer@gentoo.org> cups-1.5.2-r4.ebuild: Stable for HPPA (bug #411887). diff --git a/net-print/cups/cups-1.5.2-r20.ebuild b/net-print/cups/cups-1.5.2-r20.ebuild index 4c0b15848c42..df8aed69f6d4 100644 --- a/net-print/cups/cups-1.5.2-r20.ebuild +++ b/net-print/cups/cups-1.5.2-r20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r20.ebuild,v 1.1 2012/04/26 21:51:03 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r20.ebuild,v 1.2 2012/05/02 21:42:08 dilfridge Exp $ EAPI=4 @@ -37,6 +37,7 @@ RDEPEND=" sys-apps/attr ) ) + avahi? ( net-dns/avahi ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) @@ -241,6 +242,7 @@ src_install() { # install our init script local neededservices + use avahi && neededservices+=" avahi-daemon" use dbus && neededservices+=" dbus" [[ -n ${neededservices} ]] && neededservices="need${neededservices}" cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die diff --git a/net-print/cups/cups-1.5.2-r4.ebuild b/net-print/cups/cups-1.5.2-r4.ebuild index 7670b7bc2747..9e82a21eadb2 100644 --- a/net-print/cups/cups-1.5.2-r4.ebuild +++ b/net-print/cups/cups-1.5.2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.3 2012/05/01 19:31:17 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.4 2012/05/02 21:42:08 dilfridge Exp $ EAPI=4 @@ -37,6 +37,7 @@ RDEPEND=" sys-apps/attr ) ) + avahi? ( net-dns/avahi ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) @@ -236,6 +237,7 @@ src_install() { # install our init script local neededservices + use avahi && neededservices+=" avahi-daemon" use dbus && neededservices+=" dbus" [[ -n ${neededservices} ]] && neededservices="need${neededservices}" cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die |