* [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.5.0-r3.ebuild
@ 2012-01-27 19:37 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 3+ messages in thread
From: Andreas HAttel (dilfridge) @ 2012-01-27 19:37 UTC (permalink / raw
To: gentoo-commits
dilfridge 12/01/27 19:37:37
Modified: ChangeLog cups-1.5.0-r3.ebuild
Log:
Some cleanups in the ebuild
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Revision Changes Path
1.443 net-print/cups/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.443&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.443&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.442&r2=1.443
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- ChangeLog 22 Jan 2012 17:14:51 -0000 1.442
+++ ChangeLog 27 Jan 2012 19:37:37 -0000 1.443
@@ -1,6 +1,9 @@
# 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.442 2012/01/22 17:14:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.443 2012/01/27 19:37:37 dilfridge Exp $
+
+ 27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.0-r3.ebuild:
+ Some cleanups in the ebuild
22 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r1.ebuild,
cups-1.4.8-r23.ebuild, cups-1.5.0-r3.ebuild:
1.5 net-print/cups/cups-1.5.0-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild?r1=1.4&r2=1.5
Index: cups-1.5.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-1.5.0-r3.ebuild 22 Jan 2012 17:14:51 -0000 1.4
+++ cups-1.5.0-r3.ebuild 27 Jan 2012 19:37:37 -0000 1.5
@@ -1,13 +1,8 @@
# 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.0-r3.ebuild,v 1.4 2012/01/22 17:14:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v 1.5 2012/01/27 19:37:37 dilfridge Exp $
-#
-# See http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=blob;f=net-print/cups/notes.txt;hb=HEAD
-# for some notes about the ongoing work here
-#
-
-EAPI=3
+EAPI=4
PYTHON_DEPEND="python? 2:2.5"
@@ -72,7 +67,7 @@
filters? ( net-print/foomatic-filters )
"
-# upstream includes an interactive test which is a nono for gentoo.
+# upstream includes an interactive test which is a nono for gentoo
RESTRICT="test"
S="${WORKDIR}/${MY_P}"
@@ -97,6 +92,7 @@
epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
epatch "${FILESDIR}/${PN}-1.4.8-largeimage.patch"
+
# security fixes
epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-3170.patch"
@@ -126,16 +122,6 @@
"
fi
- # bug 352252, recheck for later versions if still necessary....
- if use gnutls && ! use threads ; then
- ewarn "The useflag gnutls requires also threads enabled. Switching on threads."
- fi
- if use gnutls || use threads ; then
- myconf+=" --enable-threads "
- else
- myconf+=" --disable-threads "
- fi
-
econf \
--libdir=/usr/$(get_libdir) \
--localstatedir=/var \
@@ -156,6 +142,7 @@
$(use_enable png) \
$(use_enable slp) \
$(use_enable static-libs static) \
+ $(use_enable threads) \
$(use_enable tiff) \
$(use_enable usb libusb) \
$(use_with java) \
@@ -175,7 +162,7 @@
}
src_compile() {
- emake || die "emake failed"
+ emake
if use perl ; then
cd "${S}"/scripting/perl
@@ -185,13 +172,13 @@
if use php ; then
cd "${S}"/scripting/php
- emake || die "emake php failed"
+ emake
fi
}
src_install() {
- emake BUILDROOT="${D}" install || die "emake install failed"
- dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed"
+ emake BUILDROOT="${D}" install
+ dodoc {CHANGES,CREDITS,README}.txt
if use perl ; then
cd "${S}"/scripting/perl
@@ -215,7 +202,7 @@
sed -i \
-e "s/@neededservices@/$neededservices/" \
"${T}"/cupsd || die
- doinitd "${T}"/cupsd || die "doinitd failed"
+ doinitd "${T}"/cupsd
# install our pam script
pamd_mimic_system cups auth account
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.5.0-r3.ebuild
@ 2012-01-27 19:52 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 3+ messages in thread
From: Andreas HAttel (dilfridge) @ 2012-01-27 19:52 UTC (permalink / raw
To: gentoo-commits
dilfridge 12/01/27 19:52:13
Modified: ChangeLog cups-1.5.0-r3.ebuild
Log:
Downgrade gnutls version requirement. Lets see what breaks now.
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Revision Changes Path
1.445 net-print/cups/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.445&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.445&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.444&r2=1.445
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- ChangeLog 27 Jan 2012 19:39:20 -0000 1.444
+++ ChangeLog 27 Jan 2012 19:52:13 -0000 1.445
@@ -1,6 +1,9 @@
# 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.444 2012/01/27 19:39:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.445 2012/01/27 19:52:13 dilfridge Exp $
+
+ 27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.0-r3.ebuild:
+ Downgrade gnutls version requirement. Lets see what breaks now.
27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
-cups-1.4.8-r22.ebuild, -cups-1.5.0-r2.ebuild:
1.6 net-print/cups/cups-1.5.0-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild?r1=1.5&r2=1.6
Index: cups-1.5.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cups-1.5.0-r3.ebuild 27 Jan 2012 19:37:37 -0000 1.5
+++ cups-1.5.0-r3.ebuild 27 Jan 2012 19:52:13 -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/cups/cups-1.5.0-r3.ebuild,v 1.5 2012/01/27 19:37:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v 1.6 2012/01/27 19:52:13 dilfridge Exp $
EAPI=4
@@ -46,7 +46,7 @@
ssl? (
gnutls? (
dev-libs/libgcrypt
- >=net-libs/gnutls-2.11
+ net-libs/gnutls
)
!gnutls? ( >=dev-libs/openssl-0.9.8g )
)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.5.0-r3.ebuild
@ 2012-01-27 22:18 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 3+ messages in thread
From: Andreas HAttel (dilfridge) @ 2012-01-27 22:18 UTC (permalink / raw
To: gentoo-commits
dilfridge 12/01/27 22:18:20
Modified: ChangeLog cups-1.5.0-r3.ebuild
Log:
Re-add usb useflag / kernel configuration checks, but only on linux, bug 382675
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Revision Changes Path
1.447 net-print/cups/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.447&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.447&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.446&r2=1.447
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- ChangeLog 27 Jan 2012 21:30:49 -0000 1.446
+++ ChangeLog 27 Jan 2012 22:18:20 -0000 1.447
@@ -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.446 2012/01/27 21:30:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.447 2012/01/27 22:18:20 dilfridge Exp $
+
+ 27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.0-r3.ebuild:
+ Re-add usb useflag / kernel configuration checks, but only on linux, bug
+ 382675
27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r1.ebuild,
cups-1.4.8-r23.ebuild, cups-1.5.0-r3.ebuild:
1.8 net-print/cups/cups-1.5.0-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild?r1=1.7&r2=1.8
Index: cups-1.5.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cups-1.5.0-r3.ebuild 27 Jan 2012 21:30:49 -0000 1.7
+++ cups-1.5.0-r3.ebuild 27 Jan 2012 22:18:20 -0000 1.8
@@ -1,12 +1,12 @@
# 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.0-r3.ebuild,v 1.7 2012/01/27 21:30:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v 1.8 2012/01/27 22:18:20 dilfridge Exp $
EAPI=4
PYTHON_DEPEND="python? 2:2.5"
-inherit autotools eutils fdo-mime gnome2-utils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
MY_P=${P/_}
MY_PV=${PV/_}
@@ -54,7 +54,6 @@
usb? ( virtual/libusb:0 )
X? ( x11-misc/xdg-utils )
xinetd? ( sys-apps/xinetd )
- !net-print/cupsddk
"
DEPEND="${RDEPEND}
@@ -82,6 +81,42 @@
python_set_active_version 2
python_pkg_setup
fi
+
+ if use kernel_linux; then
+ linux-info_pkg_setup
+ if ! linux_config_exists; then
+ ewarn "Can't check the linux kernel configuration."
+ ewarn "You might have some incompatible options enabled."
+ else
+ # recheck that we don't have usblp to collide with libusb
+ if use usb; then
+ if linux_chkconfig_present USB_PRINTER; then
+ eerror "Your usb printers will be managed via libusb. In this case, "
+ eerror "${P} requires the USB_PRINTER support disabled."
+ eerror "Please disable it:"
+ eerror " CONFIG_USB_PRINTER=n"
+ eerror "in /usr/src/linux/.config or"
+ eerror " Device Drivers --->"
+ eerror " USB support --->"
+ eerror " [ ] USB Printer support"
+ eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+ fi
+ else
+ #here we should warn user that he should enable it so he can print
+ if ! linux_chkconfig_present USB_PRINTER; then
+ ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+ ewarn "support in your kernel."
+ ewarn "Please enable it:"
+ ewarn " CONFIG_USB_PRINTER=y"
+ ewarn "in /usr/src/linux/.config or"
+ ewarn " Device Drivers --->"
+ ewarn " USB support --->"
+ ewarn " [*] USB Printer support"
+ ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+ fi
+ fi
+ fi
+ fi
}
src_prepare() {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-27 22:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-27 19:37 [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.5.0-r3.ebuild Andreas HAttel (dilfridge)
-- strict thread matches above, loose matches on Subject: below --
2012-01-27 19:52 Andreas HAttel (dilfridge)
2012-01-27 22:18 Andreas HAttel (dilfridge)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox