Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 337692 Details for
Bug 455158
net-print/hplip - python-r1 migration help required
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
ebuild using python-r1 eclass
hplip-3.12.11-r1.diff (text/plain), 3.23 KB, created by
Daniel Pielmeier
on 2013-02-02 17:51:38 UTC
(
hide
)
Description:
ebuild using python-r1 eclass
Filename:
MIME Type:
Creator:
Daniel Pielmeier
Created:
2013-02-02 17:51:38 UTC
Size:
3.23 KB
patch
obsolete
>--- hplip-3.12.11.ebuild 2013-01-08 19:54:23.654553670 +0100 >+++ hplip-3.12.11-r1.ebuild 2013-02-02 18:33:27.195014324 +0100 >@@ -4,11 +4,10 @@ > > EAPI=5 > >-PYTHON_DEPEND="!minimal? 2" >-PYTHON_USE_WITH="threads xml" >-PYTHON_USE_WITH_OPT="!minimal" >+PYTHON_COMPAT=( python{2_6,2_7} ) >+PYTHON_REQ_USE="threads,xml" > >-inherit eutils fdo-mime linux-info python udev autotools toolchain-funcs >+inherit eutils fdo-mime linux-info python-single-r1 udev autotools toolchain-funcs > > DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools." > HOMEPAGE="http://hplipopensource.com/hplip-web/index.html" >@@ -23,10 +22,14 @@ > # Thus support for it is also disabled in hplip. > IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X" > >+# TODO: check if net-print/cups, sys-apps/dbus/dbus, net-analyzer/net-snmp >+# and dev-python/notify-python are migrated to python-r1 >+ > COMMON_DEPEND=" > virtual/jpeg > hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) > !minimal? ( >+ ${PYTHON_DEPS} > >=net-print/cups-1.4.0 > !libusb0? ( virtual/libusb:1 ) > libusb0? ( virtual/libusb:0 ) >@@ -43,15 +46,15 @@ > > RDEPEND="${COMMON_DEPEND} > >=app-text/ghostscript-gpl-8.71-r3 >- dev-python/dbus-python >+ >=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}] > policykit? ( > sys-auth/polkit > ) > !minimal? ( >- dev-python/pygobject:2 >+ >=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}] > kernel_linux? ( virtual/udev !<sys-fs/udev-114 ) > scanner? ( >- dev-python/imaging >+ >=dev-python/imaging-1.1.7-r2[${PYTHON_USEDEP}] > X? ( || ( > kde? ( kde-misc/skanlite ) > media-gfx/xsane >@@ -59,11 +62,11 @@ > ) ) > ) > fax? ( >- dev-python/reportlab >- dev-python/dbus-python >+ >=dev-python/reportlab-2.6[${PYTHON_USEDEP}] >+ >=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}] > ) > qt4? ( >- dev-python/PyQt4[dbus,X] >+ >=dev-python/PyQt4-4.9.6-r2[dbus,X,${PYTHON_USEDEP}] > libnotify? ( > dev-python/notify-python > ) >@@ -74,10 +77,7 @@ > ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)." > > pkg_setup() { >- if ! use minimal; then >- python_set_active_version 2 >- python_pkg_setup >- fi >+ use !minimal && python-single-r1_pkg_setup > > ! use qt4 && ewarn "You need USE=qt4 for the hplip GUI." > >@@ -99,7 +99,10 @@ > } > > src_prepare() { >- use !minimal && python_convert_shebangs -q -r 2 . >+ if use !minimal ; then >+ python_export EPYTHON PYTHON >+ python_fix_shebang . >+ fi > > EPATCH_SUFFIX="patch" \ > EPATCH_FORCE="yes" \ >@@ -236,12 +239,14 @@ > rm -rf "${D}"/usr/share/hal || die > > find "${D}" -name '*.la' -exec rm -rf {} + || die >+ >+ if use !minimal ; then >+ python_export EPYTHON PYTHON >+ python_optimize "${D}"/usr/share/hplip >+ fi > } > > pkg_postinst() { >- use !minimal && python_mod_optimize /usr/share/${PN} >- fdo-mime_desktop_database_update >- > if [[ -z "${REPLACING_VERSIONS}" ]]; then > elog "For more information on setting up your printer please take" > elog "a look at the hplip section of the gentoo printing guide:" >@@ -250,8 +255,3 @@ > elog "Any user who wants to print must be in the lp group." > fi > } >- >-pkg_postrm() { >- use !minimal && python_mod_cleanup /usr/share/${PN} >- fdo-mime_desktop_database_update >-}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 455158
:
337678
| 337692