* [gentoo-commits] gentoo-x86 commit in net-print/hplip: hplip-3.12.2-r2.ebuild ChangeLog hplip-3.12.4.ebuild
@ 2012-05-06 11:42 Daniel Pielmeier (billie)
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Pielmeier (billie) @ 2012-05-06 11:42 UTC (permalink / raw
To: gentoo-commits
billie 12/05/06 11:42:45
Modified: hplip-3.12.2-r2.ebuild ChangeLog
hplip-3.12.4.ebuild
Log:
Use patch tarball.
(Portage version: 2.1.10.49/cvs/Linux i686)
Revision Changes Path
1.5 net-print/hplip/hplip-3.12.2-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild?r1=1.4&r2=1.5
Index: hplip-3.12.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hplip-3.12.2-r2.ebuild 5 May 2012 15:50:38 -0000 1.4
+++ hplip-3.12.2-r2.ebuild 6 May 2012 11:42:45 -0000 1.5
@@ -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/hplip/hplip-3.12.2-r2.ebuild,v 1.4 2012/05/05 15:50:38 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild,v 1.5 2012/05/06 11:42:45 billie Exp $
EAPI=4
@@ -12,7 +12,8 @@
DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+ http://dev.gentoo.org/~billie/distfiles/${P}-patches-1.tar.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -95,53 +96,15 @@
src_prepare() {
use !minimal && python_convert_shebangs -q -r 2 .
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"
+
# Fix for Gentoo bug #345725
sed -i -e "s|/etc/udev/rules.d|/lib/udev/rules.d|" \
$(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
|| die
- # Do not install desktop files if there is no gui
- # Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
- epatch "${FILESDIR}"/${PN}-3.11.1-desktop.patch
-
- # Browser detection through xdg-open
- # Upstream bug: https://bugs.launchpad.net/hplip/+bug/482674
- epatch "${FILESDIR}"/${PN}-3.9.10-browser.patch
-
- # Use cups-config when checking for cupsddk
- # Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
- epatch "${FILESDIR}"/${PN}-3.9.12-cupsddk.patch
-
- # Htmldocs are not installed under docdir/html so enable htmldir configure
- # switch
- # Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
- epatch "${FILESDIR}"/${PN}-3.11.1-htmldir.patch
-
- # Let 56-hpmud_support.rules call hp-mkuri to make it work with newer udev
- # Upstream bug: None
- epatch "${FILESDIR}"/${PN}-3.11.12-udev-rules.patch
-
- # CVE-2010-4267 SNMP Response Processing Buffer Overflow Vulnerability
- # http://secunia.com/advisories/42956/
- # https://bugzilla.redhat.com/show_bug.cgi?id=662740
- epatch "${FILESDIR}"/${PN}-3.10.9-cve-2010-4267.patch
-
- # Fix black stripes on pcl5c printouts
- # Upstream bug: https://bugs.launchpad.net/hplip/+bug/561264
- epatch "${FILESDIR}"/${PN}-3.11.12-black-stripes-pcl5c.patch
-
- # Fix parallel port cpu usage
- # Upstream bug: https://bugs.launchpad.net/hplip/+bug/750796
- epatch "${FILESDIR}"/${PN}-3.11.12-fast-pp.patch
-
- # Fix minmal/hpijs_only/hpcups_only install
- # Upstream bug: https://bugs.launchpad.net/hplip/+bug/932918
- epatch "${FILESDIR}"/${P}-minimal.patch
-
- # Fix Option parsing in sane/scan.py
- # Upstream bug: https://bugs.launchpad.net/hplip/+bug/927708
- epatch "${FILESDIR}"/${P}-sane.patch
-
# Force recognition of Gentoo distro by hp-check
sed -i \
-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
1.226 net-print/hplip/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/ChangeLog?rev=1.226&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/ChangeLog?rev=1.226&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/ChangeLog?r1=1.225&r2=1.226
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- ChangeLog 6 May 2012 11:00:22 -0000 1.225
+++ ChangeLog 6 May 2012 11:42:45 -0000 1.226
@@ -1,6 +1,13 @@
# ChangeLog for net-print/hplip
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.225 2012/05/06 11:00:22 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.226 2012/05/06 11:42:45 billie Exp $
+
+ 06 May 2012; Daniel Pielmeier <billie@gentoo.org>
+ -files/hplip-3.11.12-black-stripes-pcl5c.patch,
+ -files/hplip-3.11.12-fast-pp.patch, -files/hplip-3.11.12-udev-rules.patch,
+ hplip-3.12.2-r2.ebuild, -files/hplip-3.12.2-minimal.patch,
+ -files/hplip-3.12.2-sane.patch, hplip-3.12.4.ebuild:
+ Use patch tarball.
06 May 2012; Daniel Pielmeier <billie@gentoo.org> hplip-3.12.4.ebuild,
-files/hplip-3.12.4-cupsddk.patch, -files/hplip-3.12.4-desktop.patch,
1.6 net-print/hplip/hplip-3.12.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild?r1=1.5&r2=1.6
Index: hplip-3.12.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hplip-3.12.4.ebuild 6 May 2012 11:00:22 -0000 1.5
+++ hplip-3.12.4.ebuild 6 May 2012 11:42:45 -0000 1.6
@@ -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/hplip/hplip-3.12.4.ebuild,v 1.5 2012/05/06 11:00:22 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild,v 1.6 2012/05/06 11:42:45 billie Exp $
EAPI=4
@@ -94,18 +94,17 @@
}
src_prepare() {
-
use !minimal && python_convert_shebangs -q -r 2 .
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"
+
# Fix for Gentoo bug #345725
sed -i -e "s|/etc/udev/rules.d|/lib/udev/rules.d|" \
$(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
|| die
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"
-
# Force recognition of Gentoo distro by hp-check
sed -i \
-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/hplip: hplip-3.12.2-r2.ebuild ChangeLog hplip-3.12.4.ebuild
@ 2012-05-21 17:27 Daniel Pielmeier (billie)
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Pielmeier (billie) @ 2012-05-21 17:27 UTC (permalink / raw
To: gentoo-commits
billie 12/05/21 17:27:50
Modified: hplip-3.12.2-r2.ebuild ChangeLog
hplip-3.12.4.ebuild
Log:
Remove REQUIRED_USE to fix big #416693. Thanks to T6n9naYMKJ@ymail.com.
(Portage version: 2.1.10.49/cvs/Linux i686)
Revision Changes Path
1.6 net-print/hplip/hplip-3.12.2-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild?r1=1.5&r2=1.6
Index: hplip-3.12.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hplip-3.12.2-r2.ebuild 6 May 2012 11:42:45 -0000 1.5
+++ hplip-3.12.2-r2.ebuild 21 May 2012 17:27:50 -0000 1.6
@@ -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/hplip/hplip-3.12.2-r2.ebuild,v 1.5 2012/05/06 11:42:45 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild,v 1.6 2012/05/21 17:27:50 billie Exp $
EAPI=4
@@ -23,8 +23,6 @@
# Thus support for it is also disabled in hplip.
IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -acl X"
-REQUIRED_USE="|| ( hpijs hpcups )"
-
COMMON_DEPEND="
virtual/jpeg
hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
@@ -84,6 +82,12 @@
use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+ if ! use hpcups && ! use hpijs ; then
+ ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+ ewarn "which is probably not what you want."
+ ewarn "You will almost certainly not be able to print."
+ fi
+
if use minimal ; then
ewarn "Installing driver portions only, make sure you know what you are doing."
ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
1.228 net-print/hplip/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/ChangeLog?rev=1.228&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/ChangeLog?rev=1.228&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/ChangeLog?r1=1.227&r2=1.228
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- ChangeLog 8 May 2012 15:40:31 -0000 1.227
+++ ChangeLog 21 May 2012 17:27:50 -0000 1.228
@@ -1,6 +1,10 @@
# ChangeLog for net-print/hplip
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.227 2012/05/08 15:40:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.228 2012/05/21 17:27:50 billie Exp $
+
+ 21 May 2012; Daniel Pielmeier <billie@gentoo.org> hplip-3.12.2-r2.ebuild,
+ hplip-3.12.4.ebuild:
+ Remove REQUIRED_USE to fix big #416693. Thanks to T6n9naYMKJ@ymail.com.
08 May 2012; Brent Baude <ranger@gentoo.org> hplip-3.12.4.ebuild:
Marking hplip-3.12.4 ppc64 for bug 414161
1.8 net-print/hplip/hplip-3.12.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild?r1=1.7&r2=1.8
Index: hplip-3.12.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hplip-3.12.4.ebuild 8 May 2012 15:40:31 -0000 1.7
+++ hplip-3.12.4.ebuild 21 May 2012 17:27:50 -0000 1.8
@@ -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/hplip/hplip-3.12.4.ebuild,v 1.7 2012/05/08 15:40:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild,v 1.8 2012/05/21 17:27:50 billie Exp $
EAPI=4
@@ -23,8 +23,6 @@
# Thus support for it is also disabled in hplip.
IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -acl X"
-REQUIRED_USE="|| ( hpijs hpcups )"
-
COMMON_DEPEND="
virtual/jpeg
hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
@@ -84,6 +82,12 @@
use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+ if ! use hpcups && ! use hpijs ; then
+ ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+ ewarn "which is probably not what you want."
+ ewarn "You will almost certainly not be able to print."
+ fi
+
if use minimal ; then
ewarn "Installing driver portions only, make sure you know what you are doing."
ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-21 17:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-21 17:27 [gentoo-commits] gentoo-x86 commit in net-print/hplip: hplip-3.12.2-r2.ebuild ChangeLog hplip-3.12.4.ebuild Daniel Pielmeier (billie)
-- strict thread matches above, loose matches on Subject: below --
2012-05-06 11:42 Daniel Pielmeier (billie)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox