cleanup

author: V3n3RiX <venerix@rogentos.ro> 2016-08-11 00:33:31 +0100
committer: V3n3RiX <venerix@rogentos.ro> 2016-08-11 00:33:31 +0100
commit: ff5dd7b3704b9e8f9f606d4929f95694ec84ddf3 (patch)
tree: 393b3bd8a65eb3ec464babab42da8d9ec88851c3 /net-print
parent: 4c05e04608db666140daaa94499f5f90521a2cc4 (diff)
40 files changed, 0 insertions, 3695 deletions
diff --git a/net-print/brother-hl5340d-drivers/Manifest b/net-print/brother-hl5340d-drivers/Manifest
deleted file mode 100644
index 1ea18423..00000000
--- a/net-print/brother-hl5340d-drivers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST BR5340_2_GPL.ppd.gz 5677 SHA256 e8b8bb0688c2a181c9ebbb597ca7f467513262420bbf9a3c9bc1e2cf6e0bf9ee SHA512 2cbbbd18cb298eb3ac67fe2cfdb637ecc48996520848142caee08b810edbb07a738dfee87e734f98c6310e2f6cf7e2bc782cb685f9eef43d163169002ba93fec WHIRLPOOL fce09d1281255c68a85facf76dd8a1dafb2a839df90a8d9a901fe5e4a54d3c41ad7daa8572a8ebcbdd4c46f7358f5ac2fb7495d74af80d2d9c45675473fef7ad
-DIST cupswrapperHL5340D-2.0.4-1.i386.rpm 14738 SHA256 d84fa72cfe3e41dfedae9bc47692d943487efbb512e5d78eaa73fe1a0a24064d SHA512 3807d98d992f5e82ebeff4ec7aadecc693fda1269515af517ba0d1006164266e4f64599701e1aaab66febea468a5b219cec5bca7f8773101d541aae9d1b89f1b WHIRLPOOL 04119de2254337e1158b8c217eeee2b980f0fb9f2769befeaf79a7626cd16944d5ba24a8f3f3b96ac168dafa1988fc19878cc1e8ae16c6b5e8720dd327c2af36
-DIST hl5340dlpr-2.0.3-1.i386.rpm 43247 SHA256 22d9bf3bb4dca33eb07d7fe6f60f51a85ebe5f288a73adf926434e0559df3abd SHA512 883e2e83a7a0843f22630e5a7af4b71e6a651f3ec8bc076d6856c4101bf4e0ca590592e5e5ca18eb50bcc4872eee7d0aade3504393d123a7ca9763cdb464cbff WHIRLPOOL d7d4e8dadb51dfffd04ad4149fe1db2bcedaf9c6cf40940fce8ae1a5d6523d77b2758ce80b4908067bca22c6ea1e12134b46690cfff98e64c71fce02cd428ec9
diff --git a/net-print/brother-hl5340d-drivers/brother-hl5340d-drivers-2.0.4-r1.ebuild b/net-print/brother-hl5340d-drivers/brother-hl5340d-drivers-2.0.4-r1.ebuild
deleted file mode 100644
index 4be6dccb..00000000
--- a/net-print/brother-hl5340d-drivers/brother-hl5340d-drivers-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Sabayon
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib rpm
-
-WRAPPER_VER="2.0.4-1"
-LPR_VER="2.0.3-1"
-
-DESCRIPTION="CUPS filters and drivers for Brother HL-5340D"
-HOMEPAGE="http://welcome.solutions.brother.com/bsc/public_s/id/linux/en/download_prn.html"
-SRC_URI="http://www.brother.com/pub/bsc/linux/dlf/hl5340dlpr-${LPR_VER}.i386.rpm
-	http://www.brother.com/pub/bsc/linux/dlf/cupswrapperHL5340D-${WRAPPER_VER}.i386.rpm
-	http://www.brother.com/pub/bsc/linux/dlf/BR5340_2_GPL.ppd.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="${DEPEND}"
-RDEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs )
-	app-text/ghostscript-gpl
-	net-print/cups"
-
-S="${WORKDIR}"
-RESTRICT="strip"
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}/cupswrapper.patch"
-}
-
-src_install() {
-	# Thanks to the Arch folks!
-	mkdir -p usr/share || die
-	mv "${S}/usr/local/Brother" "${S}/usr/share/brother" || die
-
-	# Fix paths, move away from /usr/local
-	sed -i "s;/usr/local/Brother;/usr/share/brother;g" $(grep -rl "/usr/local/Brother" .) || die
-
-	# Create and install the file 'brPrintList'. This file must exist and contain the name
-	# of the printer in order to make CUPS settings work. Else, settings done in CUPS are
-	# not reflected in the file /usr/share/brother/inf/brHL5340Drc and thus are not considered
-	# by the LPR driver that's doing the actual printing.
-	mkdir -p "${S}/usr/share/brother/inf" || die
-	echo "HL5340D" > "${S}/usr/share/brother/inf/brPrintList" || die
-
-	# Generate the cups filter
-	cd "${S}" || die
-	./usr/share/brother/cupswrapper/cupswrapperHL5340D-2.0.4 || die
-	insinto /usr/share/cups/model
-	newins "${WORKDIR}/BR5340_2_GPL.ppd" HL5340D.ppd
-	exeinto /usr/libexec/cups/filter
-	doexe brlpdwrapperHL5340D || die
-
-	# move /usr/local crap to /usr/share
-	dodir /usr/share
-	cd "${S}/usr/share" || die
-	insinto /usr/share
-	# preserve permissions
-	cp -rp brother "${D}/usr/share/" || die
-	fperms 0755 /usr/share/brother/inf/brHL5340Drc
-
-	dodir /usr/$(get_libdir)
-	exeinto /usr/$(get_libdir)
-	doexe "${S}"/usr/lib/*
-
-	dodir /usr/bin
-	exeinto /usr/bin
-	doexe "${S}"/usr/bin/*
-}
diff --git a/net-print/brother-hl5340d-drivers/brother-hl5340d-drivers-2.0.4-r2.ebuild b/net-print/brother-hl5340d-drivers/brother-hl5340d-drivers-2.0.4-r2.ebuild
deleted file mode 100644
index 612f9258..00000000
--- a/net-print/brother-hl5340d-drivers/brother-hl5340d-drivers-2.0.4-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Sabayon
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils multilib rpm
-
-WRAPPER_VER="2.0.4-1"
-LPR_VER="2.0.3-1"
-
-DESCRIPTION="CUPS filters and drivers for Brother HL-5340D"
-HOMEPAGE="http://welcome.solutions.brother.com/bsc/public_s/id/linux/en/download_prn.html"
-SRC_URI="http://www.brother.com/pub/bsc/linux/dlf/hl5340dlpr-${LPR_VER}.i386.rpm
-	http://www.brother.com/pub/bsc/linux/dlf/cupswrapperHL5340D-${WRAPPER_VER}.i386.rpm
-	http://www.brother.com/pub/bsc/linux/dlf/BR5340_2_GPL.ppd.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="${DEPEND}"
-RDEPEND="
-	app-text/ghostscript-gpl
-	net-print/cups"
-
-S="${WORKDIR}"
-RESTRICT="strip"
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}/cupswrapper.patch"
-}
-
-src_install() {
-	# Thanks to the Arch folks!
-	mkdir -p usr/share || die
-	mv "${S}/usr/local/Brother" "${S}/usr/share/brother" || die
-
-	# Fix paths, move away from /usr/local
-	sed -i "s;/usr/local/Brother;/usr/share/brother;g" $(grep -rl "/usr/local/Brother" .) || die
-
-	# Create and install the file 'brPrintList'. This file must exist and contain the name
-	# of the printer in order to make CUPS settings work. Else, settings done in CUPS are
-	# not reflected in the file /usr/share/brother/inf/brHL5340Drc and thus are not considered
-	# by the LPR driver that's doing the actual printing.
-	mkdir -p "${S}/usr/share/brother/inf" || die
-	echo "HL5340D" > "${S}/usr/share/brother/inf/brPrintList" || die
-
-	# Generate the cups filter
-	cd "${S}" || die
-	./usr/share/brother/cupswrapper/cupswrapperHL5340D-2.0.4 || die
-	insinto /usr/share/cups/model
-	newins "${WORKDIR}/BR5340_2_GPL.ppd" HL5340D.ppd
-	exeinto /usr/libexec/cups/filter
-	doexe brlpdwrapperHL5340D || die
-
-	# move /usr/local crap to /usr/share
-	dodir /usr/share
-	cd "${S}/usr/share" || die
-	insinto /usr/share
-	# preserve permissions
-	cp -rp brother "${D}/usr/share/" || die
-	fperms 0755 /usr/share/brother/inf/brHL5340Drc
-
-	dodir /usr/$(get_libdir)
-	exeinto /usr/$(get_libdir)
-	doexe "${S}"/usr/lib/*
-
-	dodir /usr/bin
-	exeinto /usr/bin
-	doexe "${S}"/usr/bin/*
-}
diff --git a/net-print/brother-hl5340d-drivers/files/cupswrapper.patch b/net-print/brother-hl5340d-drivers/files/cupswrapper.patch
deleted file mode 100644
index b0a99663..00000000
--- a/net-print/brother-hl5340d-drivers/files/cupswrapper.patch
+++ /dev/null
@@ -1,255 +0,0 @@
---- a/usr/local/Brother/cupswrapper/cupswrapperHL5340D-2.0.4
-+++ b/usr/local/Brother/cupswrapper/cupswrapperHL5340D-2.0.4
-@@ -17,53 +17,56 @@
- # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- # Place, Suite 330, Boston, MA  02111-1307  USA
- #
-+# 
-+# if [ "$1" = '-e' ]; then
-+#   lpadmin -x HL5340D
-+#   rm -f /usr/share/cups/model/HL5340D.ppd
-+#   rm -f /usr/lib/cups/filter/brlpdwrapperHL5340D
-+#   rm -f /usr/lib64/cups/filter/brlpdwrapperHL5340D
-+#   rm -f /usr/local/Brother/cupswrapper/brcupsconfig3
-+#   if [ -f /usr/share/ppd/HL5340D.ppd ];then
-+#   rm -f /usr/share/ppd/HL5340D.ppd
-+#   fi
-+#   if [ -e /etc/init.d/cups ]; then
-+#     /etc/init.d/cups restart
-+#   fi
-+#   if [ -e /etc/init.d/cupsys ]; then
-+#     /etc/init.d/cupsys restart
-+#   fi
-+#   exit 0 
-+# fi
-+# if [ "$1" = "-r" ]; then
-+#   lpadmin -x HL5340D
-+#   if [ -e /etc/init.d/cups ]; then
-+#     /etc/init.d/cups restart
-+#   fi
-+#   if [ -e /etc/init.d/cupsys ]; then
-+#     /etc/init.d/cupsys restart
-+#   fi
-+#   exit 0 
-+# fi
-+# if [ "$1" = "help" ] || [ "$1" = "-h" ]; then
-+#   echo   'option -h : help'
-+#   echo   '       -i : install'
-+#   echo   '       -e : uninstall'
-+#   echo   '       -r : remove printer'
-+#   exit 0
-+# fi
-+# mkdir -p /usr/lib/cups/filter
-+# 
-+# if [ -e "/usr/local/Brother/lpd/filterHL5340D" ]; then
-+#   :
-+# else
-+#   echo "ERROR : Brother LPD filter is not installed."
-+# fi
-+# rm -f /usr/share/cups/model/HL5340D.ppd
-+# ppd_file_name=/usr/share/cups/model/HL5340D.ppd
-+# if [ ! -e /usr/share/cups/model ]; then
-+#    ppd_file_name=/usr/share/ppd/HL5340D.ppd
-+# fi
- 
--if [ "$1" = '-e' ]; then
--  lpadmin -x HL5340D
--  rm -f /usr/share/cups/model/HL5340D.ppd
--  rm -f /usr/lib/cups/filter/brlpdwrapperHL5340D
--  rm -f /usr/lib64/cups/filter/brlpdwrapperHL5340D
--  rm -f /usr/local/Brother/cupswrapper/brcupsconfig3
--  if [ -f /usr/share/ppd/HL5340D.ppd ];then
--  rm -f /usr/share/ppd/HL5340D.ppd
--  fi
--  if [ -e /etc/init.d/cups ]; then
--    /etc/init.d/cups restart
--  fi
--  if [ -e /etc/init.d/cupsys ]; then
--    /etc/init.d/cupsys restart
--  fi
--  exit 0 
--fi
--if [ "$1" = "-r" ]; then
--  lpadmin -x HL5340D
--  if [ -e /etc/init.d/cups ]; then
--    /etc/init.d/cups restart
--  fi
--  if [ -e /etc/init.d/cupsys ]; then
--    /etc/init.d/cupsys restart
--  fi
--  exit 0 
--fi
--if [ "$1" = "help" ] || [ "$1" = "-h" ]; then
--  echo   'option -h : help'
--  echo   '       -i : install'
--  echo   '       -e : uninstall'
--  echo   '       -r : remove printer'
--  exit 0
--fi
--mkdir -p /usr/lib/cups/filter
--
--if [ -e "/usr/local/Brother/lpd/filterHL5340D" ]; then
--  :
--else
--  echo "ERROR : Brother LPD filter is not installed."
--fi
--rm -f /usr/share/cups/model/HL5340D.ppd
--ppd_file_name=/usr/share/cups/model/HL5340D.ppd
--if [ ! -e /usr/share/cups/model ]; then
--   ppd_file_name=/usr/share/ppd/HL5340D.ppd
--fi
-+# Write PPD file into CWD
-+ppd_file_name=HL5340D.ppd
- 
- cat <<ENDOFPPDFILE >$ppd_file_name
- *PPD-Adobe: "4.3"
-@@ -370,23 +373,25 @@
- *End
- 
- ENDOFPPDFILE
-+# 
-+# chmod 755  $ppd_file_name
-+# if [ -e '/usr/share/ppd' ];then
-+#   if [ -e '/usr/share/cups/model' ];then
-+#     cp  $ppd_file_name  /usr/share/ppd
-+#   fi
-+# fi
-+# 
-+# brotherlpdwrapper=/usr/lib/cups/filter/brlpdwrapperHL5340D
-+# brotherlpdwrapper64=/usr/lib64/cups/filter/brlpdwrapperHL5340D
-+# rm -f  $brotherlpdwrapper
-+# if [ ! -e /usr/lib/cups/filter ];then
-+#   if [ -e /usr/lib64/cups/filter ];then
-+#     brotherlpdwrapper=/usr/lib64/cups/filter/brlpdwrapperHL5340D
-+#   fi
-+# fi
- 
--chmod 755  $ppd_file_name
--if [ -e '/usr/share/ppd' ];then
--  if [ -e '/usr/share/cups/model' ];then
--    cp  $ppd_file_name  /usr/share/ppd
--  fi
--fi
--
--brotherlpdwrapper=/usr/lib/cups/filter/brlpdwrapperHL5340D
--brotherlpdwrapper64=/usr/lib64/cups/filter/brlpdwrapperHL5340D
--rm -f  $brotherlpdwrapper
--if [ ! -e /usr/lib/cups/filter ];then
--  if [ -e /usr/lib64/cups/filter ];then
--    brotherlpdwrapper=/usr/lib64/cups/filter/brlpdwrapperHL5340D
--  fi
--fi
--
-+# Write brlpdwrapper into CWD
-+brotherlpdwrapper=brlpdwrapperHL5340D
- 
- cat <<!ENDOFWFILTER! >$brotherlpdwrapper
- #! /bin/sh
-@@ -517,25 +522,25 @@
- fi
- 
- 
--if [ -e "/usr/local/Brother/lpd/filter\$PRINTER" ]; then
-+if [ -e "/usr/share/brother/lpd/filter\$PRINTER" ]; then
-        :
- else
--    echo "ERROR: /usr/local/Brother/lpd/filter\$PRINTER does not exist"   >>\$LOGFILE
-+    echo "ERROR: /usr/share/brother/lpd/filter\$PRINTER does not exist"   >>\$LOGFILE
-     errorcode=30
-     exit $errorcode
- fi
- 
--if [ -e "/usr/local/Brother/cupswrapper/brcupsconfig3" ]; then
-+if [ -e "/usr/share/brother/cupswrapper/brcupsconfig3" ]; then
-   if [ \$DEBUG = 0 ]; then
--     /usr/local/Brother/cupswrapper/brcupsconfig3  \$PRINTER  \$PPD 0 "\$options" >> /dev/null
-+     /usr/share/brother/cupswrapper/brcupsconfig3  \$PRINTER  \$PPD 0 "\$options" >> /dev/null
-   else
--     /usr/local/Brother/cupswrapper/brcupsconfig3  \$PRINTER  \$PPD \$LOGCLEVEL "\$options" >>\$LOGFILE
-+     /usr/share/brother/cupswrapper/brcupsconfig3  \$PRINTER  \$PPD \$LOGCLEVEL "\$options" >>\$LOGFILE
-   fi
- fi
- 
- 
- if [ \$DEBUG -le 2 ]; then
--    cat    \$INPUT_TEMP_PS | /usr/local/Brother/lpd/filter\$PRINTER
-+    cat    \$INPUT_TEMP_PS | /usr/share/brother/lpd/filter\$PRINTER
- fi
- 
- if [ \$DEBUG -ge 2 ];  then
-@@ -551,39 +556,39 @@
- 
- !ENDOFWFILTER!
- 
--
--chmod 755 $brotherlpdwrapper
--if [ -e /usr/lib/cups/filter ]; then
-- if [ -e /usr/lib64/cups/filter ]; then
--   cp $brotherlpdwrapper  $brotherlpdwrapper64
-- fi
--fi
--
--chmod a+w /usr/local/Brother/inf/brHL5340Drc
--chmod a+w /usr/local/Brother/inf
--if [ -e /etc/init.d/lpd ]; then
--   /etc/init.d/lpd stop
--fi
--if [  -e /etc/init.d/lprng ]; then
--   /etc/init.d/lprng stop
--fi
--  if [ -e /etc/init.d/cups ]; then
--    /etc/init.d/cups restart
--  fi
--  if [ -e /etc/init.d/cupsys ]; then
--    /etc/init.d/cupsys restart
--  fi
--sleep 2s
--port2=`lpinfo -v | grep -i 'usb://Brother/HL5340D' | head -1`
--if [ "$port2" = '' ];then
--  port2=`lpinfo -v | grep -i 'usb://Brother/' | head -1`
--  if [ "$port2" = '' ];then
--	   port2=`lpinfo -v | grep 'usb://' | head -1`
--  fi
--fi
--port=`echo $port2| sed s/direct//g`
--if [ "$port" = '' ];then
--	port=usb:/dev/usb/lp0
--fi
--lpadmin -p HL5340D -E -v $port -P $ppd_file_name
--  exit 0 
-+# 
-+# chmod 755 $brotherlpdwrapper
-+# if [ -e /usr/lib/cups/filter ]; then
-+#  if [ -e /usr/lib64/cups/filter ]; then
-+#    cp $brotherlpdwrapper  $brotherlpdwrapper64
-+#  fi
-+# fi
-+# 
-+# chmod a+w /usr/share/brother/inf/brHL5340Drc
-+# chmod a+w /usr/share/brother/inf
-+# if [ -e /etc/init.d/lpd ]; then
-+#    /etc/init.d/lpd stop
-+# fi
-+# if [  -e /etc/init.d/lprng ]; then
-+#    /etc/init.d/lprng stop
-+# fi
-+#   if [ -e /etc/init.d/cups ]; then
-+#     /etc/init.d/cups restart
-+#   fi
-+#   if [ -e /etc/init.d/cupsys ]; then
-+#     /etc/init.d/cupsys restart
-+#   fi
-+# sleep 2s
-+# port2=`lpinfo -v | grep -i 'usb://Brother/HL5340D' | head -1`
-+# if [ "$port2" = '' ];then
-+#   port2=`lpinfo -v | grep -i 'usb://Brother/' | head -1`
-+#   if [ "$port2" = '' ];then
-+# 	   port2=`lpinfo -v | grep 'usb://' | head -1`
-+#   fi
-+# fi
-+# port=`echo $port2| sed s/direct//g`
-+# if [ "$port" = '' ];then
-+# 	port=usb:/dev/usb/lp0
-+# fi
-+# lpadmin -p HL5340D -E -v $port -P $ppd_file_name
-+#   exit 0 
diff --git a/net-print/cnijfilter-drivers/Manifest b/net-print/cnijfilter-drivers/Manifest
deleted file mode 100644
index 6f5802d3..00000000
--- a/net-print/cnijfilter-drivers/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cnijfilter-source-3.20-1.tar.gz 6494749 SHA256 2fc4dcd79d6644baeb0c8a0ee1b43dc9f59f44d21f773c0d85bfe2660a180b9a SHA512 3e6e5f3ed43e4054938387298a6d116828a0928568b3a165622c5a61abe9e39a30bc6d99a336317be228a794f0a2645b8f5453939695879f209b1a061b7d9164 WHIRLPOOL e368000c2d38ee0714513b9836edf8eaeea48945c8790c202418ae1508b64037edd76436228644177b66b9ccd6f097eb470a67a561385342363f3170490a3319
-DIST cnijfilter-source-3.60-1.tar.gz 9577578 SHA256 7e4f91a0aebfa32d75da046a20bab992bd6032bb2069cf0091e77d8119a489de SHA512 69b5c0f3b6bc886d32937e710d244b1cba1644bda025280703ec231d2243c2e0ff6a321b9bc68f8cc43ae596559619aa0f587a7b6d9b0d3b583b22f6faaac2d7 WHIRLPOOL c1325ff5f0e489d0367d05a0ffb27a56f89249487f8b531cf2adbc311773dd3cadb32cc70b6ac82bb3474be88ea00a092eb2bb89e75d74d0f6bdd8c73599b816
-DIST cnijfilter-source-3.70-1.tar.gz 8479039 SHA256 6bd51f1926bb11afaf42633eaed6f0e8ee6424e452a2ca1f746f3146f7bc10be SHA512 1f9e8979e436fb99a146b27ea56e29961cdfc9f6a8c30c79fbe64a87e1c22f6cef86af48c56ea1bf086f6a0791822f9381ef41b6fa92a9af9cbf989cac80b797 WHIRLPOOL c8e054fec759630c1bb11efa6e86e96425cf169f828c70898f6cad7c1e7841bb4e31c1b883eaed3e17599c84619644382ab91ce9606be6fcd70ae57a13ed5339
-DIST cnijfilter-source-3.80-1.tar.gz 8923054 SHA256 8b6d408f18191f19465ee8fc31aa08455e8bec186fdd3f02ee822f53a9b086a9 SHA512 95a16e3b4fc38ce0b7a12bd74466d97e726bc410b59bf6d1963fa52b16a8cc67f6a993a5ef945107201f860d8ac6734c462bc0bf6d2160d6c85c5f61aff040c1 WHIRLPOOL 2e27afa454ce1fa41700f65ace7ae7469464cc8685499c4927c559aef2fd79613297d1ec1e5cf1dd309da541c5b662a0c4d4d71fabf4b514e186eb2bceb80c5c
diff --git a/net-print/cnijfilter-drivers/cnijfilter-drivers-3.20.ebuild b/net-print/cnijfilter-drivers/cnijfilter-drivers-3.20.ebuild
deleted file mode 100644
index f8f920e4..00000000
--- a/net-print/cnijfilter-drivers/cnijfilter-drivers-3.20.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_PN="${PN/-drivers/}"
-
-inherit eutils autotools flag-o-matic multilib
-
-DESCRIPTION="Canon InkJet Printer Driver for Linux (Pixus/Pixma-Series)."
-HOMEPAGE="http://support-sg.canon-asia.com/contents/SG/EN/0100236704.html"
-SRC_URI="http://gdlp01.c-wss.com/gds/7/0100002367/01/${MY_PN}-source-${PV}-1.tar.gz"
-
-LICENSE="GPL-2 cnijfilter"
-SLOT="${PV}"
-KEYWORDS="~x86"
-PRINTER_USE=( mp250 mp270 mp490 mp550 mp560 ip4700 mp640 )
-PRINTER_ID=( 356 357 358 359 360 361 362 )
-IUSE="${PRINTER_USE[@]} +servicetools"
-
-RDEPEND="
-	net-print/cnijfilter[servicetools?]
-	>=media-libs/libpng-1.5
-	>=media-libs/tiff-3.4
-	>=net-print/cups-1.4
-	servicetools? (
-		>=dev-libs/libxml2-2.7.3-r2
-		>=x11-libs/gtk+-2.6:2
-	)
-"
-DEPEND="${DEPEND}
-	sys-devel/gettext
-"
-
-REQUIRED_USE="|| ( ${PRINTER_USE[@]} )"
-
-S="${WORKDIR}/${MY_PN}-source-${PV}-1"
-
-_dir_build() {
-	local dirs=$1
-	local command=$2
-	local d
-
-	[[ $# -ne 2 ]] && die "Call as: _dir_build DIRS COMMAND"
-
-	for d in ${dirs}; do
-		local suffix=""
-		echo ">>> Working in: ${d}"
-		pushd ${d} >/dev/null
-		# progpath must be set otherwise we go for /usr/local/bin
-		if [[ ${command} == econf* ]]; then
-			${command} --enable-progpath="${EPREFIX}/usr/bin"
-		else
-			${command}
-		fi
-		popd > /dev/null
-	done
-}
-
-_printer_dir_build() {
-	local command=$1
-	local d
-
-	[[ $# -ne 1 ]] && die "Call as: _printer_dir_build COMMAND"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		if use ${name}; then
-			for d in ${DIRS_PRINTER}; do
-				echo ">>> Working in: ${name}/${d}"
-				pushd ${name}/${d} > /dev/null
-				if [[ ${command} == econf* ]]; then
-					${command} \
-						--enable-progpath="${EPREFIX}/usr/bin" \
-						--program-suffix=${name}
-				else
-					${command}
-				fi
-				popd > /dev/null
-			done
-		fi
-	done
-}
-
-pkg_setup() {
-	[[ -z ${LINGUAS} ]] && LINGUAS="en"
-
-	DIRS_PRINTER="cnijfilter"
-	# lgmon must be first as it is required by cngpijmon
-	use servicetools && DIRS_PRINTER+=" lgmon cngpijmon printui"
-}
-
-src_prepare() {
-	local d i
-
-	# missing macros directory make aclocal fail
-	mkdir printui/m4 || die
-
-	epatch \
-		"${FILESDIR}/${MY_PN}"-3.70-png.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-ppd.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-ppd2.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-libexec-cups.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-libexec-backend.patch
-
-	_dir_build "${DIRS_PRINTER}" "eautoreconf"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		local pid="${PRINTER_ID[$i]}"
-		if use ${name}; then
-			mkdir -p ${name} || die
-			ln -s "${S}"/${pid} ${name}/ || die
-			for d in ${DIRS_PRINTER}; do
-				cp -a ${d} ${name} || die
-			done
-		fi
-	done
-}
-
-src_configure() {
-	local d i
-
-	_printer_dir_build "econf"
-}
-
-src_compile() {
-	_printer_dir_build "emake"
-}
-
-src_install() {
-	local _libdir="${EPREFIX}/usr/$(get_libdir)"
-	local _libdir_pkg=libs_bin$(use amd64 && echo 64 || echo 32)
-	local _ppddir="${EPREFIX}/usr/share/cups/model"
-
-	_printer_dir_build "emake DESTDIR=${D} install"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		local pid="${PRINTER_ID[$i]}"
-		if use ${name}; then
-			dodir ${_libdir}
-			# no doexe due to symlinks
-			cp -a "${pid}/${_libdir_pkg}"/* "${D}/${_libdir}" || die
-			exeinto ${_libdir}/cnijlib
-			doexe ${pid}/database/*
-			# create symlink for the cnijlib to bjlib as some formats need it
-			dosym ${_libdir}/cnijlib ${_libdir}/bjlib
-			insinto ${_ppddir}
-			doins ppd/canon${name}.ppd
-		fi
-	done
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "For installing a printer:"
-	einfo " * Restart CUPS: /etc/init.d/cupsd restart"
-	einfo " * Go to http://127.0.0.1:631/"
-	einfo "   -> Printers -> Add Printer"
-	einfo ""
-	einfo "If you experience any problems, please visit:"
-	einfo " http://forums.gentoo.org/viewtopic-p-3217721.html"
-	einfo ""
-}
diff --git a/net-print/cnijfilter-drivers/cnijfilter-drivers-3.60.ebuild b/net-print/cnijfilter-drivers/cnijfilter-drivers-3.60.ebuild
deleted file mode 100644
index ca8036f7..00000000
--- a/net-print/cnijfilter-drivers/cnijfilter-drivers-3.60.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_PN="${PN/-drivers/}"
-
-inherit eutils autotools flag-o-matic multilib
-
-DESCRIPTION="Canon InkJet Printer Driver for Linux (Pixus/Pixma-Series)."
-HOMEPAGE="http://support-sg.canon-asia.com/contents/SG/EN/0100392802.html"
-SRC_URI="http://gdlp01.c-wss.com/gds/8/0100003928/01/${MY_PN}-source-${PV}-1.tar.gz"
-
-LICENSE="GPL-2 cnijfilter"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-PRINTER_USE=( mg2100 mg3100 mg4100 mg5300 mg6200 mg8200 ip4900 e500 )
-PRINTER_ID=( 386 387 388 389 390 391 392 393 )
-IUSE="${PRINTER_USE[@]} +servicetools"
-
-RDEPEND="
-	net-print/cnijfilter[servicetools?]
-	>=media-libs/libpng-1.5
-	>=media-libs/tiff-3.4
-	>=net-print/cups-1.4
-	servicetools? (
-		>=dev-libs/libxml2-2.7.3-r2
-		>=x11-libs/gtk+-2.6:2
-	)
-"
-DEPEND="${DEPEND}
-	sys-devel/gettext
-"
-
-REQUIRED_USE="|| ( ${PRINTER_USE[@]} )"
-
-S="${WORKDIR}/${MY_PN}-source-${PV}-1"
-
-_dir_build() {
-	local dirs=$1
-	local command=$2
-	local d
-
-	[[ $# -ne 2 ]] && die "Call as: _dir_build DIRS COMMAND"
-
-	for d in ${dirs}; do
-		local suffix=""
-		echo ">>> Working in: ${d}"
-		pushd ${d} >/dev/null
-		# progpath must be set otherwise we go for /usr/local/bin
-		if [[ ${command} == econf* ]]; then
-			${command} --enable-progpath="${EPREFIX}/usr/bin"
-		else
-			${command}
-		fi
-		popd > /dev/null
-	done
-}
-
-_printer_dir_build() {
-	local command=$1
-	local d
-
-	[[ $# -ne 1 ]] && die "Call as: _printer_dir_build COMMAND"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		if use ${name}; then
-			for d in ${DIRS_PRINTER}; do
-				echo ">>> Working in: ${name}/${d}"
-				pushd ${name}/${d} > /dev/null
-				if [[ ${command} == econf* ]]; then
-					${command} \
-						--enable-progpath="${EPREFIX}/usr/bin" \
-						--program-suffix=${name}
-				else
-					${command}
-				fi
-				popd > /dev/null
-			done
-		fi
-	done
-}
-
-pkg_setup() {
-	[[ -z ${LINGUAS} ]] && LINGUAS="en"
-
-	DIRS_PRINTER="cnijfilter"
-	# lgmon must be first as it is required by cngpijmon
-	use servicetools && DIRS_PRINTER+=" lgmon cngpijmon printui"
-}
-
-src_prepare() {
-	local d i
-
-	# missing macros directory make aclocal fail
-	mkdir printui/m4 || die
-
-	epatch \
-		"${FILESDIR}/${MY_PN}"-3.70-png.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-ppd.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-ppd2.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-libexec-cups.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-libexec-backend.patch
-
-	_dir_build "${DIRS_PRINTER}" "eautoreconf"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		local pid="${PRINTER_ID[$i]}"
-		if use ${name}; then
-			mkdir -p ${name} || die
-			ln -s "${S}"/${pid} ${name}/ || die
-			for d in ${DIRS_PRINTER}; do
-				cp -a ${d} ${name} || die
-			done
-		fi
-	done
-}
-
-src_configure() {
-	local d i
-
-	_printer_dir_build "econf"
-}
-
-src_compile() {
-	_printer_dir_build "emake"
-}
-
-src_install() {
-	local _libdir="${EPREFIX}/usr/$(get_libdir)"
-	local _libdir_pkg=libs_bin$(use amd64 && echo 64 || echo 32)
-	local _ppddir="${EPREFIX}/usr/share/cups/model"
-
-	_printer_dir_build "emake DESTDIR=${D} install"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		local pid="${PRINTER_ID[$i]}"
-		if use ${name}; then
-			dodir ${_libdir}
-			# no doexe due to symlinks
-			cp -a "${pid}/${_libdir_pkg}"/* "${D}/${_libdir}" || die
-			exeinto ${_libdir}/cnijlib
-			doexe ${pid}/database/*
-			# create symlink for the cnijlib to bjlib as some formats need it
-			dosym ${_libdir}/cnijlib ${_libdir}/bjlib
-			insinto ${_ppddir}
-			doins ppd/canon${name}.ppd
-		fi
-	done
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "For installing a printer:"
-	einfo " * Restart CUPS: /etc/init.d/cupsd restart"
-	einfo " * Go to http://127.0.0.1:631/"
-	einfo "   -> Printers -> Add Printer"
-	einfo ""
-	einfo "If you experience any problems, please visit:"
-	einfo " http://forums.gentoo.org/viewtopic-p-3217721.html"
-	einfo ""
-}
diff --git a/net-print/cnijfilter-drivers/cnijfilter-drivers-3.70.ebuild b/net-print/cnijfilter-drivers/cnijfilter-drivers-3.70.ebuild
deleted file mode 100644
index ced74ef1..00000000
--- a/net-print/cnijfilter-drivers/cnijfilter-drivers-3.70.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_PN="${PN/-drivers/}"
-
-inherit eutils autotools flag-o-matic multilib
-
-DESCRIPTION="Canon InkJet Printer Driver for Linux (Pixus/Pixma-Series)."
-HOMEPAGE="http://support-sg.canon-asia.com/contents/SG/EN/0100411802.html"
-SRC_URI="http://gdlp01.c-wss.com/gds/8/0100004118/01/${MY_PN}-source-${PV}-1.tar.gz"
-
-LICENSE="GPL-2 cnijfilter"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-PRINTER_USE=( ip100 mx710 mx890 mx370 mx430 mx510 e600 )
-PRINTER_ID=( 303 394 395 396 397 398 399 )
-IUSE="${PRINTER_USE[@]} +servicetools"
-
-RDEPEND="
-	net-print/cnijfilter[servicetools?]
-	>=media-libs/libpng-1.5
-	>=media-libs/tiff-3.4
-	>=net-print/cups-1.4
-	servicetools? (
-		>=dev-libs/libxml2-2.7.3-r2
-		>=x11-libs/gtk+-2.6:2
-	)
-"
-DEPEND="${DEPEND}
-	sys-devel/gettext
-"
-
-REQUIRED_USE="|| ( ${PRINTER_USE[@]} )"
-
-S="${WORKDIR}/${MY_PN}-source-${PV}-1"
-
-_dir_build() {
-	local dirs=$1
-	local command=$2
-	local d
-
-	[[ $# -ne 2 ]] && die "Call as: _dir_build DIRS COMMAND"
-
-	for d in ${dirs}; do
-		local suffix=""
-		echo ">>> Working in: ${d}"
-		pushd ${d} >/dev/null
-		# progpath must be set otherwise we go for /usr/local/bin
-		if [[ ${command} == econf* ]]; then
-			${command} --enable-progpath="${EPREFIX}/usr/bin"
-		else
-			${command}
-		fi
-		popd > /dev/null
-	done
-}
-
-_printer_dir_build() {
-	local command=$1
-	local d
-
-	[[ $# -ne 1 ]] && die "Call as: _printer_dir_build COMMAND"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		if use ${name}; then
-			for d in ${DIRS_PRINTER}; do
-				echo ">>> Working in: ${name}/${d}"
-				pushd ${name}/${d} > /dev/null
-				if [[ ${command} == econf* ]]; then
-					${command} \
-						--enable-progpath="${EPREFIX}/usr/bin" \
-						--program-suffix=${name}
-				else
-					${command}
-				fi
-				popd > /dev/null
-			done
-		fi
-	done
-}
-
-pkg_setup() {
-	[[ -z ${LINGUAS} ]] && LINGUAS="en"
-
-	DIRS_PRINTER="cnijfilter"
-	# lgmon must be first as it is required by cngpijmon
-	use servicetools && DIRS_PRINTER+=" lgmon cngpijmon printui"
-}
-
-src_prepare() {
-	local d i
-
-	# missing macros directory make aclocal fail
-	mkdir printui/m4 || die
-
-	epatch \
-		"${FILESDIR}/${MY_PN}"-3.70-png.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-ppd.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-ppd2.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-libexec-cups.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-libexec-backend.patch
-
-	_dir_build "${DIRS_PRINTER}" "eautoreconf"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		local pid="${PRINTER_ID[$i]}"
-		if use ${name}; then
-			mkdir -p ${name} || die
-			ln -s "${S}"/${pid} ${name}/ || die
-			for d in ${DIRS_PRINTER}; do
-				cp -a ${d} ${name} || die
-			done
-		fi
-	done
-}
-
-src_configure() {
-	local d i
-
-	_printer_dir_build "econf"
-}
-
-src_compile() {
-	_printer_dir_build "emake"
-}
-
-src_install() {
-	local _libdir="${EPREFIX}/usr/$(get_libdir)"
-	local _libdir_pkg=libs_bin$(use amd64 && echo 64 || echo 32)
-	local _ppddir="${EPREFIX}/usr/share/cups/model"
-
-	_printer_dir_build "emake DESTDIR=${D} install"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		local pid="${PRINTER_ID[$i]}"
-		if use ${name}; then
-			dodir ${_libdir}
-			# no doexe due to symlinks
-			cp -a "${pid}/${_libdir_pkg}"/* "${D}/${_libdir}" || die
-			exeinto ${_libdir}/cnijlib
-			doexe ${pid}/database/*
-			# create symlink for the cnijlib to bjlib as some formats need it
-			dosym ${_libdir}/cnijlib ${_libdir}/bjlib
-			insinto ${_ppddir}
-			doins ppd/canon${name}.ppd
-		fi
-	done
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "For installing a printer:"
-	einfo " * Restart CUPS: /etc/init.d/cupsd restart"
-	einfo " * Go to http://127.0.0.1:631/"
-	einfo "   -> Printers -> Add Printer"
-	einfo ""
-	einfo "If you experience any problems, please visit:"
-	einfo " http://forums.gentoo.org/viewtopic-p-3217721.html"
-	einfo ""
-}
diff --git a/net-print/cnijfilter-drivers/cnijfilter-drivers-3.80.ebuild b/net-print/cnijfilter-drivers/cnijfilter-drivers-3.80.ebuild
deleted file mode 100644
index 008fd20a..00000000
--- a/net-print/cnijfilter-drivers/cnijfilter-drivers-3.80.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_PN="${PN/-drivers/}"
-
-inherit eutils autotools flag-o-matic multilib
-
-DESCRIPTION="Canon InkJet Printer Driver for Linux (Pixus/Pixma-Series)."
-HOMEPAGE="http://support-sg.canon-asia.com/contents/SG/EN/0100469302.html"
-SRC_URI="http://gdlp01.c-wss.com/gds/3/0100004693/01/${MY_PN}-source-${PV}-1.tar.gz"
-
-LICENSE="GPL-2 cnijfilter"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-PRINTER_USE=( mp230 mg2200 e510 mg3200 mg4200 ip7200 mg5400 mg6300 )
-PRINTER_ID=( 401 402 403 404 405 406 407 408 )
-IUSE="${PRINTER_USE[@]} +servicetools"
-
-RDEPEND="
-	net-print/cnijfilter[servicetools?]
-	>=media-libs/libpng-1.5
-	>=media-libs/tiff-3.4
-	>=net-print/cups-1.4
-	servicetools? (
-		>=dev-libs/libxml2-2.7.3-r2
-		>=x11-libs/gtk+-2.6:2
-	)
-"
-DEPEND="${DEPEND}
-	sys-devel/gettext
-"
-
-REQUIRED_USE="|| ( ${PRINTER_USE[@]} )"
-
-S="${WORKDIR}/${MY_PN}-source-${PV}-1"
-
-_dir_build() {
-	local dirs=$1
-	local command=$2
-	local d
-
-	[[ $# -ne 2 ]] && die "Call as: _dir_build DIRS COMMAND"
-
-	for d in ${dirs}; do
-		local suffix=""
-		echo ">>> Working in: ${d}"
-		pushd ${d} >/dev/null
-		# progpath must be set otherwise we go for /usr/local/bin
-		if [[ ${command} == econf* ]]; then
-			${command} --enable-progpath="${EPREFIX}/usr/bin"
-		else
-			${command}
-		fi
-		popd > /dev/null
-	done
-}
-
-_printer_dir_build() {
-	local command=$1
-	local d
-
-	[[ $# -ne 1 ]] && die "Call as: _printer_dir_build COMMAND"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		if use ${name}; then
-			for d in ${DIRS_PRINTER}; do
-				echo ">>> Working in: ${name}/${d}"
-				pushd ${name}/${d} > /dev/null
-				if [[ ${command} == econf* ]]; then
-					${command} \
-						--enable-progpath="${EPREFIX}/usr/bin" \
-						--program-suffix=${name}
-				else
-					${command}
-				fi
-				popd > /dev/null
-			done
-		fi
-	done
-}
-
-pkg_setup() {
-	[[ -z ${LINGUAS} ]] && LINGUAS="en"
-
-	DIRS_PRINTER="cnijfilter"
-	# lgmon must be first as it is required by cngpijmon
-	use servicetools && DIRS_PRINTER+=" lgmon cngpijmon maintenance"
-}
-
-src_prepare() {
-	local d i
-
-	# missing macros directory make aclocal fail
-	mkdir maintenance/m4 || die
-
-	epatch \
-		"${FILESDIR}/${MY_PN}"-3.70-png.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-ppd.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-ppd2.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-libexec-cups.patch \
-		"${FILESDIR}/${MY_PN}"-3.70-libexec-backend.patch \
-		"${FILESDIR}/${MY_PN}"-3.80-cups.patch
-
-	_dir_build "${DIRS_PRINTER}" "eautoreconf"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		local pid="${PRINTER_ID[$i]}"
-		if use ${name}; then
-			mkdir -p ${name} || die
-			ln -s "${S}"/${pid} ${name}/ || die
-			for d in ${DIRS_PRINTER}; do
-				cp -a ${d} ${name} || die
-			done
-		fi
-	done
-}
-
-src_configure() {
-	local d i
-
-	_printer_dir_build "econf"
-}
-
-src_compile() {
-	_printer_dir_build "emake"
-}
-
-src_install() {
-	local _libdir="${EPREFIX}/usr/$(get_libdir)"
-	local _libdir_pkg=libs_bin$(use amd64 && echo 64 || echo 32)
-	local _ppddir="${EPREFIX}/usr/share/cups/model"
-
-	_printer_dir_build "emake DESTDIR=${D} install"
-
-	for (( i=0; i<${#PRINTER_USE[@]}; i++ )); do
-		local name="${PRINTER_USE[$i]}"
-		local pid="${PRINTER_ID[$i]}"
-		if use ${name}; then
-			dodir ${_libdir}
-			# no doexe due to symlinks
-			cp -a "${pid}/${_libdir_pkg}"/* "${D}/${_libdir}" || die
-			exeinto ${_libdir}/cnijlib
-			doexe ${pid}/database/*
-			# create symlink for the cnijlib to bjlib as some formats need it
-			dosym ${_libdir}/cnijlib ${_libdir}/bjlib
-			insinto ${_ppddir}
-			doins ppd/canon${name}.ppd
-		fi
-	done
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "For installing a printer:"
-	einfo " * Restart CUPS: /etc/init.d/cupsd restart"
-	einfo " * Go to http://127.0.0.1:631/"
-	einfo "   -> Printers -> Add Printer"
-	einfo ""
-	einfo "If you experience any problems, please visit:"
-	einfo " http://forums.gentoo.org/viewtopic-p-3217721.html"
-	einfo ""
-}
diff --git a/net-print/cnijfilter-drivers/files/cnijfilter-3.70-libexec-backend.patch b/net-print/cnijfilter-drivers/files/cnijfilter-3.70-libexec-backend.patch
deleted file mode 100644
index ca2073a5..00000000
--- a/net-print/cnijfilter-drivers/files/cnijfilter-3.70-libexec-backend.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN cnijfilter-source-3.70-1.old/backend/src/Makefile.am cnijfilter-source-3.70-1/backend/src/Makefile.am
---- cnijfilter-source-3.70-1.old/backend/src/Makefile.am	2012-12-22 11:09:21.674631729 +0100
-+++ cnijfilter-source-3.70-1/backend/src/Makefile.am	2012-12-22 14:20:50.879566578 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--backend_bindir = /usr/lib/cups/backend
-+backend_bindir = /usr/libexec/cups/backend
- backend_bin_PROGRAMS = cnijusb
- transform = 
- 
-diff -urN cnijfilter-source-3.70-1.old/backendnet/backend/Makefile.am cnijfilter-source-3.70-1/backendnet/backend/Makefile.am
---- cnijfilter-source-3.70-1.old/backendnet/backend/Makefile.am	2012-12-22 11:09:21.673631729 +0100
-+++ cnijfilter-source-3.70-1/backendnet/backend/Makefile.am	2012-12-22 14:20:20.176569425 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--backendnet_bindir = /usr/lib/cups/backend
-+backendnet_bindir = /usr/libexec/cups/backend
- backendnet_bin_PROGRAMS = cnijnet
- transform = 
- 
diff --git a/net-print/cnijfilter-drivers/files/cnijfilter-3.70-libexec-cups.patch b/net-print/cnijfilter-drivers/files/cnijfilter-3.70-libexec-cups.patch
deleted file mode 100644
index 858343f4..00000000
--- a/net-print/cnijfilter-drivers/files/cnijfilter-3.70-libexec-cups.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN cnijfilter-source-3.70-1.old/pstocanonij/filter/Makefile.am cnijfilter-source-3.70-1/pstocanonij/filter/Makefile.am
---- cnijfilter-source-3.70-1.old/pstocanonij/filter/Makefile.am	2012-12-21 17:27:54.370964561 +0100
-+++ cnijfilter-source-3.70-1/pstocanonij/filter/Makefile.am	2012-12-21 18:22:48.804097963 +0100
-@@ -1,4 +1,4 @@
--filterdir=$(libdir)/cups/filter
-+filterdir=$(libexecdir)/cups/filter
- 
- filter_PROGRAMS= pstocanonij
- 
diff --git a/net-print/cnijfilter-drivers/files/cnijfilter-3.70-png.patch b/net-print/cnijfilter-drivers/files/cnijfilter-3.70-png.patch
deleted file mode 100644
index 0e32f236..00000000
--- a/net-print/cnijfilter-drivers/files/cnijfilter-3.70-png.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cnijfilter-3.70/cnijfilter/src/bjfimage.c	2011-09-22 04:33:34.000000000 +0200
-+++ cnijfilter-3.70/cnijfilter/src/bjfimage.c	2012-09-15 16:22:38.000000000 +0200
-@@ -1520,8 +1520,8 @@
- 	short			tmpformat;
- 	short			retbyte = 0;
- 	short			bpp = 3;
--	long			width = 0;
--	long			length = 0;
-+	png_uint_32		width = 0;
-+	png_uint_32		length = 0;
- 	long			rstep = 0;
- 	long			RasterLength = 0;
- 	long			i;
-@@ -1574,7 +1574,7 @@
- 		goto onErr;
- 	}
- 
--	if (setjmp (png_p->jmpbuf))
-+	if (setjmp (png_jmpbuf(png_p)))
- 	{
- 		png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
- 		goto onErr;
diff --git a/net-print/cnijfilter-drivers/files/cnijfilter-3.70-ppd.patch b/net-print/cnijfilter-drivers/files/cnijfilter-3.70-ppd.patch
deleted file mode 100644
index a1d1ad23..00000000
--- a/net-print/cnijfilter-drivers/files/cnijfilter-3.70-ppd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN cnijfilter-source-3.70-1.old/cngpijmon/src/bjcupsmon_cups.c cnijfilter-source-3.70-1/cngpijmon/src/bjcupsmon_cups.c
---- cnijfilter-source-3.70-1.old/cngpijmon/src/bjcupsmon_cups.c	2012-12-21 17:27:54.599964570 +0100
-+++ cnijfilter-source-3.70-1/cngpijmon/src/bjcupsmon_cups.c	2012-12-21 17:28:42.076966493 +0100
-@@ -20,6 +20,7 @@
- /*** Includes ***/
- #include <cups/cups.h>
- #include <cups/language.h>
-+#include <cups/ppd.h>
- #include <sys/types.h>
- #include <unistd.h>
- #include <pwd.h>
diff --git a/net-print/cnijfilter-drivers/files/cnijfilter-3.70-ppd2.patch b/net-print/cnijfilter-drivers/files/cnijfilter-3.70-ppd2.patch
deleted file mode 100644
index 8b1e6ae3..00000000
--- a/net-print/cnijfilter-drivers/files/cnijfilter-3.70-ppd2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN cnijfilter-source-3.70-1.old/backend/src/cnij_backend_common.c cnijfilter-source-3.70-1/backend/src/cnij_backend_common.c
---- cnijfilter-source-3.70-1.old/backend/src/cnij_backend_common.c	2012-12-22 11:09:21.674631729 +0100
-+++ cnijfilter-source-3.70-1/backend/src/cnij_backend_common.c	2012-12-22 11:11:31.903619656 +0100
-@@ -38,6 +38,7 @@
- // CUPS Header
- #include <cups/cups.h>
- #include <cups/ipp.h>
-+#include <cups/ppd.h>
- 
- // Header file for CANON
- #include "cnij_backend_common.h"
diff --git a/net-print/cnijfilter-drivers/files/cnijfilter-3.80-cups.patch b/net-print/cnijfilter-drivers/files/cnijfilter-3.80-cups.patch
deleted file mode 100644
index ddaad73e..00000000
--- a/net-print/cnijfilter-drivers/files/cnijfilter-3.80-cups.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cnijfilter-source-3.80-1.old/cngpijmon/src/bjcupsmon_cups.c	2014-04-05 23:24:12.193048137 +0200
-+++ cnijfilter-source-3.80-1/cngpijmon/src/bjcupsmon_cups.c	2014-04-05 23:11:35.748504996 +0200
-@@ -18,6 +18,7 @@
-  */
- 
- /*** Includes ***/
-+#define _IPP_PRIVATE_STRUCTURES 1
- #include <cups/cups.h>
- #include <cups/ppd.h>
- #include <cups/language.h>
diff --git a/net-print/cnijfilter/Manifest b/net-print/cnijfilter/Manifest
deleted file mode 100644
index d445c620..00000000
--- a/net-print/cnijfilter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cnijfilter-source-3.80-1.tar.gz 8923054 SHA256 8b6d408f18191f19465ee8fc31aa08455e8bec186fdd3f02ee822f53a9b086a9 SHA512 95a16e3b4fc38ce0b7a12bd74466d97e726bc410b59bf6d1963fa52b16a8cc67f6a993a5ef945107201f860d8ac6734c462bc0bf6d2160d6c85c5f61aff040c1 WHIRLPOOL 2e27afa454ce1fa41700f65ace7ae7469464cc8685499c4927c559aef2fd79613297d1ec1e5cf1dd309da541c5b662a0c4d4d71fabf4b514e186eb2bceb80c5c
diff --git a/net-print/cnijfilter/cnijfilter-3.80.ebuild b/net-print/cnijfilter/cnijfilter-3.80.ebuild
deleted file mode 100644
index d0d90f0f..00000000
--- a/net-print/cnijfilter/cnijfilter-3.80.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic multilib
-
-DESCRIPTION="Canon InkJet Printer Driver for Linux (Pixus/Pixma-Series)."
-HOMEPAGE="http://support-sg.canon-asia.com/contents/SG/EN/0100469302.html"
-SRC_URI="http://gdlp01.c-wss.com/gds/3/0100004693/01/${PN}-source-${PV}-1.tar.gz"
-
-LICENSE="GPL-2 cnijfilter"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+net +servicetools"
-
-RDEPEND="
-	>=media-libs/libpng-1.5
-	>=media-libs/tiff-3.4
-	>=net-print/cups-1.4
-	servicetools? (
-		>=dev-libs/libxml2-2.7.3-r2
-		>=x11-libs/gtk+-2.6:2
-	)
-"
-DEPEND="${DEPEND}
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${PN}-source-${PV}-1"
-
-_dir_build() {
-	local dirs=$1
-	local command=$2
-	local d
-
-	[[ $# -ne 2 ]] && die "Call as: _dir_build DIRS COMMAND"
-
-	for d in ${dirs}; do
-		local suffix=""
-		echo ">>> Working in: ${d}"
-		pushd ${d} >/dev/null
-		# progpath must be set otherwise we go for /usr/local/bin
-		if [[ ${command} == econf* ]]; then
-			${command} --enable-progpath="${EPREFIX}/usr/bin"
-		else
-			${command}
-		fi
-		popd > /dev/null
-	done
-}
-
-pkg_setup() {
-	[[ -z ${LINGUAS} ]] && LINGUAS="en"
-
-	DIRS="libs pstocanonij backend"
-	use net && DIRS+=" backendnet"
-	#use servicetools && DIRS+=" cngpij cngpijmon/cnijnpr"
-	use servicetools && DIRS+=" cngpij"
-}
-
-src_prepare() {
-	local d i
-
-	epatch \
-		"${FILESDIR}/${PN}"-3.70-png.patch \
-		"${FILESDIR}/${PN}"-3.70-ppd.patch \
-		"${FILESDIR}/${PN}"-3.70-ppd2.patch \
-		"${FILESDIR}/${PN}"-3.70-libexec-cups.patch \
-		"${FILESDIR}/${PN}"-3.70-libexec-backend.patch \
-		"${FILESDIR}/${P}"-cups1.6.patch
-
-	_dir_build "${DIRS}" "eautoreconf"
-}
-
-src_configure() {
-	local d i
-
-	_dir_build "${DIRS}" "econf"
-}
-
-src_compile() {
-	_dir_build "${DIRS}" "emake"
-}
-
-src_install() {
-	local _libdir="${EPREFIX}/usr/$(get_libdir)"
-	local _libdir_pkg=libs_bin$(use amd64 && echo 64 || echo 32)
-
-	_dir_build "${DIRS}" "emake DESTDIR=${D} install"
-
-	if use net; then
-		pushd com/${_libdir_pkg} > /dev/null
-		dodir ${_libdir}
-		# no doexe to preserve symlinks
-		cp -a libcnnet.so* "${D}/${_libdir}" || die
-		popd > /dev/null
-	fi
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "For installing a printer:"
-	einfo " * Restart CUPS: /etc/init.d/cupsd restart"
-	einfo " * Go to http://127.0.0.1:631/"
-	einfo "   -> Printers -> Add Printer"
-	einfo ""
-	einfo "If you experience any problems, please visit:"
-	einfo " http://forums.gentoo.org/viewtopic-p-3217721.html"
-	einfo ""
-}
diff --git a/net-print/cnijfilter/files/cnijfilter-3.70-libexec-backend.patch b/net-print/cnijfilter/files/cnijfilter-3.70-libexec-backend.patch
deleted file mode 100644
index ca2073a5..00000000
--- a/net-print/cnijfilter/files/cnijfilter-3.70-libexec-backend.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN cnijfilter-source-3.70-1.old/backend/src/Makefile.am cnijfilter-source-3.70-1/backend/src/Makefile.am
---- cnijfilter-source-3.70-1.old/backend/src/Makefile.am	2012-12-22 11:09:21.674631729 +0100
-+++ cnijfilter-source-3.70-1/backend/src/Makefile.am	2012-12-22 14:20:50.879566578 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--backend_bindir = /usr/lib/cups/backend
-+backend_bindir = /usr/libexec/cups/backend
- backend_bin_PROGRAMS = cnijusb
- transform = 
- 
-diff -urN cnijfilter-source-3.70-1.old/backendnet/backend/Makefile.am cnijfilter-source-3.70-1/backendnet/backend/Makefile.am
---- cnijfilter-source-3.70-1.old/backendnet/backend/Makefile.am	2012-12-22 11:09:21.673631729 +0100
-+++ cnijfilter-source-3.70-1/backendnet/backend/Makefile.am	2012-12-22 14:20:20.176569425 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--backendnet_bindir = /usr/lib/cups/backend
-+backendnet_bindir = /usr/libexec/cups/backend
- backendnet_bin_PROGRAMS = cnijnet
- transform = 
- 
diff --git a/net-print/cnijfilter/files/cnijfilter-3.70-libexec-cups.patch b/net-print/cnijfilter/files/cnijfilter-3.70-libexec-cups.patch
deleted file mode 100644
index 858343f4..00000000
--- a/net-print/cnijfilter/files/cnijfilter-3.70-libexec-cups.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN cnijfilter-source-3.70-1.old/pstocanonij/filter/Makefile.am cnijfilter-source-3.70-1/pstocanonij/filter/Makefile.am
---- cnijfilter-source-3.70-1.old/pstocanonij/filter/Makefile.am	2012-12-21 17:27:54.370964561 +0100
-+++ cnijfilter-source-3.70-1/pstocanonij/filter/Makefile.am	2012-12-21 18:22:48.804097963 +0100
-@@ -1,4 +1,4 @@
--filterdir=$(libdir)/cups/filter
-+filterdir=$(libexecdir)/cups/filter
- 
- filter_PROGRAMS= pstocanonij
- 
diff --git a/net-print/cnijfilter/files/cnijfilter-3.70-png.patch b/net-print/cnijfilter/files/cnijfilter-3.70-png.patch
deleted file mode 100644
index 0e32f236..00000000
--- a/net-print/cnijfilter/files/cnijfilter-3.70-png.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cnijfilter-3.70/cnijfilter/src/bjfimage.c	2011-09-22 04:33:34.000000000 +0200
-+++ cnijfilter-3.70/cnijfilter/src/bjfimage.c	2012-09-15 16:22:38.000000000 +0200
-@@ -1520,8 +1520,8 @@
- 	short			tmpformat;
- 	short			retbyte = 0;
- 	short			bpp = 3;
--	long			width = 0;
--	long			length = 0;
-+	png_uint_32		width = 0;
-+	png_uint_32		length = 0;
- 	long			rstep = 0;
- 	long			RasterLength = 0;
- 	long			i;
-@@ -1574,7 +1574,7 @@
- 		goto onErr;
- 	}
- 
--	if (setjmp (png_p->jmpbuf))
-+	if (setjmp (png_jmpbuf(png_p)))
- 	{
- 		png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
- 		goto onErr;
diff --git a/net-print/cnijfilter/files/cnijfilter-3.70-ppd.patch b/net-print/cnijfilter/files/cnijfilter-3.70-ppd.patch
deleted file mode 100644
index a1d1ad23..00000000
--- a/net-print/cnijfilter/files/cnijfilter-3.70-ppd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN cnijfilter-source-3.70-1.old/cngpijmon/src/bjcupsmon_cups.c cnijfilter-source-3.70-1/cngpijmon/src/bjcupsmon_cups.c
---- cnijfilter-source-3.70-1.old/cngpijmon/src/bjcupsmon_cups.c	2012-12-21 17:27:54.599964570 +0100
-+++ cnijfilter-source-3.70-1/cngpijmon/src/bjcupsmon_cups.c	2012-12-21 17:28:42.076966493 +0100
-@@ -20,6 +20,7 @@
- /*** Includes ***/
- #include <cups/cups.h>
- #include <cups/language.h>
-+#include <cups/ppd.h>
- #include <sys/types.h>
- #include <unistd.h>
- #include <pwd.h>
diff --git a/net-print/cnijfilter/files/cnijfilter-3.70-ppd2.patch b/net-print/cnijfilter/files/cnijfilter-3.70-ppd2.patch
deleted file mode 100644
index 8b1e6ae3..00000000
--- a/net-print/cnijfilter/files/cnijfilter-3.70-ppd2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN cnijfilter-source-3.70-1.old/backend/src/cnij_backend_common.c cnijfilter-source-3.70-1/backend/src/cnij_backend_common.c
---- cnijfilter-source-3.70-1.old/backend/src/cnij_backend_common.c	2012-12-22 11:09:21.674631729 +0100
-+++ cnijfilter-source-3.70-1/backend/src/cnij_backend_common.c	2012-12-22 11:11:31.903619656 +0100
-@@ -38,6 +38,7 @@
- // CUPS Header
- #include <cups/cups.h>
- #include <cups/ipp.h>
-+#include <cups/ppd.h>
- 
- // Header file for CANON
- #include "cnij_backend_common.h"
diff --git a/net-print/cnijfilter/files/cnijfilter-3.80-cups1.6.patch b/net-print/cnijfilter/files/cnijfilter-3.80-cups1.6.patch
deleted file mode 100644
index 8971d067..00000000
--- a/net-print/cnijfilter/files/cnijfilter-3.80-cups1.6.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -ur cnijfilter-source-3.80-1/cngpij/cngpij/bjcups.c cnijfilter-source-3.80-1.new/cngpij/cngpij/bjcups.c
---- cnijfilter-source-3.80-1/cngpij/cngpij/bjcups.c
-+++ cnijfilter-source-3.80-1.new/cngpij/cngpij/bjcups.c
-@@ -66,6 +66,27 @@
- 
- char* g_printer_name = NULL;
- 
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
-+#ifndef HAVE_CUPS_1_6
-+
-+#define ippSetOperation(ipp_request, ipp_op_id) ipp_request->request.op.operation_id = ipp_op_id
-+#define ippSetRequestId(ipp_request, ipp_rq_id) ipp_request->request.op.request_id = ipp_rq_id
-+#define ippGetStatusCode(ipp_request) ipp_request->request.status.status_code
-+#define ippFirstAttribute(ipp) ipp->attrs /* simplistic */
-+#define bjcups_ippNextAttribute(resp, attr) attr->next
-+#define ippGetGroupTag(attr)  attr->group_tag
-+#define ippGetName(attr) attr->name
-+#define ippGetString(attr, ind, lang) attr->values[ind].string.text
-+#define ippGetValueTag(attr) attr->value_tag
-+
-+#else
-+
-+#define bjcups_ippNextAttribute(resp, attr) ippNextAttribute(resp)
-+
-+#endif
- 
- extern int GetIPCData(LPIPCU pipc, char *sname);
- static short getDeviceURI( const char *pDestName, char *pDeviceURI, short bufSize);
-@@ -698,8 +719,8 @@
- 	else {
- 		pRequest = ippNew();
- 		
--		pRequest->request.op.operation_id = CUPS_GET_PRINTERS;
--		pRequest->request.op.request_id   = 1;
-+		ippSetOperation(pRequest, CUPS_GET_PRINTERS);
-+		ippSetRequestId(pRequest, 1);
- 		
- 		pLanguage = bjcupsLangDefault();	// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
- 		
-@@ -708,29 +729,29 @@
- 		ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);
- 		
- 		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
--			if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
-+			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
- 				fputs("ERROR: IPP ERROR\n", stderr);
- 				goto onErr;
- 			}
- 			else {
--				pAttribute = pResponse->attrs;
-+				pAttribute = ippFirstAttribute(pResponse);
- 
- 				while (pAttribute != NULL) {
--					while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) {
--						pAttribute = pAttribute->next;
-+					while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
-+						pAttribute = bjcups_ippNextAttribute(pResponse, pAttribute);
- 					}
- 					if (pAttribute == NULL) {
- 						break;
- 					}
- 					
--					while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) {
--						if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {
--							pPrinter = pAttribute->values[0].string.text;
-+					while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
-+						if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
-+							pPrinter = ippGetString(pAttribute, 0, NULL);
- 						}
--						if (strcmp(pAttribute->name, "device-uri") == 0 && pAttribute->value_tag == IPP_TAG_URI) {
--							pDUri = pAttribute->values[0].string.text;
-+						if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
-+							pDUri = ippGetString(pAttribute, 0, NULL);
- 						}
--						pAttribute = pAttribute->next;
-+						pAttribute = bjcups_ippNextAttribute(pResponse, pAttribute);
- 					}
- 
- 					if (strcasecmp(pDestName, pPrinter) == 0) {
-@@ -739,7 +760,7 @@
- 					}
- 					
- 					if (pAttribute != NULL)
--						 pAttribute = pAttribute->next;
-+						pAttribute = bjcups_ippNextAttribute(pResponse, pAttribute);
- 				}
- 			}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
deleted file mode 100644
index d7f98c2a..00000000
--- a/net-print/hplip/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-AUX hplip-3.10.9-cve-2010-4267.patch 405 SHA256 2280fb55a03d61edbd8ff928ae016c2e58e77bede83226f3d8e627e95fa6103f SHA512 25d17a65008b99fe9fc12d3a2698ec84afda96d728b184cf904fea22641b073450f1e0522d7e002b22d4c2768591cf6cb5a585a9828960ad1484a6ffda83f7b9 WHIRLPOOL 7dcf0aa4f58ef388d2edc973456b8deaca62aa5a9838b42deddc29b837326256ef774d3845f56e14b4dc035205c3de37d2be37ca09df88f14186992dfa4645c7
-AUX hplip-3.11.1-desktop.patch 506 SHA256 557faf17a05f3707e2918673ed5eff56954feab0d5555b535236c938306f4523 SHA512 64bf8e15dc3e2c7c26e599c8f69c67c169b5d422c3e668320810470bb6f1c4c7e47158efd7e1a27b9161b13e4b3df98af7ab52e47e11c92ac6d5a79437159291 WHIRLPOOL 8f085f996ce06ccccf20cfbd82bb42f1bc846d7568d6f1bbae3a85b9e8115fa93cdf2085a558cd21a98b5e6654fb0487fa676d6ed6cc6d83f2e70bc80e971c27
-AUX hplip-3.11.1-htmldir.patch 4470 SHA256 30185a66b033dfdf0db59e600b19454c7680f3fa09ea8c24adf0fff19c15585e SHA512 886426731959a5e8453a8fd2676563a143183c2ecb030cf58d07aa506088b01c2148b607304055451a26ec8d1228dcad986c1641bf8dfb51d682f05c11ee8e1a WHIRLPOOL d3ddd311f347e7b6110e8ea3189075cba8484ae6889711c34be204400002b6f8f1b89eaee2ec2d9d60c306d12c9bcb670ac13f296fc1b6fd294deed08fa714ba
-AUX hplip-3.11.10-udev-attrs.patch 13895 SHA256 83a7b126877f49fbfb28e5d9df26607e1f165a74a865030023c081c60e7256cd SHA512 f0c84e043c20eabe009eaee04785cb5969df56d2e7ec7e72860f3b727c8a4f7efd6f9b2cf106ea15e223ee3c436a0aba7f462f2c9940367bd09032338c3183cc WHIRLPOOL 566479e5b40bc8c86a87859bb4be5a3d2428907b7582ffbca84dceb95dad3c0bf757efaf1b1a35a29ce75eecd1a3a26559e2f02910812fb71d17dbb7be472b3a
-AUX hplip-3.9.10-browser.patch 1447 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875 SHA512 95d15191193d1cb8da3cab6a6f7748ec56cafba7625ec2e437510c04a46cb2265e03290793315b8eed3d69c481ffaa1b9745946d6f943ff477d0f1f6df4a1c17 WHIRLPOOL e204c62ccc1843d8353e1f7512f33083f7477ab3957f90c54208d1e0b8c3badb25a478e9e2ef4a5fe4350dfc8ebff436f413e9d7eb2c1307f6bdd4cca51d9ea3
-AUX hplip-3.9.12-cupsddk.patch 1265 SHA256 3050221f497c14ae3a7a093043018d55f4deb2b2ebd81840a8285cec4eb7759d SHA512 761ac5f14ca17c3beca6a46c32aafcd5180582d24810b9b2f2c636a19997ae4fe777c011eddfa4a03341854f99c492552d946cc843d2cada05a5d54d2cd61530 WHIRLPOOL 32684fcc8adf2fb0bd2775f98e976a8e04e7e00151b3ab7f3d7c7b0fe67149ad0f7bac7f571c341163266ef94d30dd31ddc80ea5ddab49f257eb2b44220a2a54
-AUX hplip-3.9.12-systray.patch 795 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719 SHA512 808795411e334fda023be54b52856d4068c3c016bc1b05eeccf93a24d82c7c9289a2a775017cf2962154a52c5ca19778d075e70f93e07c2e7a03fce30f9322a9 WHIRLPOOL e3d52948ca910077bc588c00303fc7b6b8ec07806a529dd020d03a6d6ab4877f24d4db33b295c95cce7527bbb3622eda6ef57b210859f2cebebba5b05c732d16
-DIST hplip-3.12.10-patches-1.tar.xz 10496 SHA256 7b8f10c1e58ca60778c5c240e51d68472237a45235a03f0b54cd1ffc9dac9632 SHA512 4947077b17bc9f4714302c99917d359cc7dda728393c8fe88d21f26e923dcb5d0535fc56c403920fce359be2951e6ac0c92cb5ba3a659bca452e08f83d8a09a8 WHIRLPOOL f759953c8495eddd0df0bbb3f2ad29e28004659d39f1d415c89604fdebf6729e914ab6830c540ff9c3f693ceb609aff882265bc0ff8a8d1e2637285d7d51158f
-DIST hplip-3.12.10.tar.gz 21832868 SHA256 66c159421c6941e20c88e9372ad2885248b0fc0546c1896cfbfce7ff840faa08 SHA512 213c9dc8d4649c08800b68f6acf4bf4e839c6a5e9aba9cc89ab7ca7c3e3bc9a6eadb3354b1fc707e3964871bde2302b71fc71ad7e7c363b9b1aa280dcff22d2b WHIRLPOOL b1845a5603efada201092bfe3aa898465645d1b8d6a0289232ea20f0352aa065c27584425299b5de5eea55085bf717bcc3bb1e8df6dacc88ec239e991a45b1da
-DIST hplip-3.12.10a.tar.gz 21827613 SHA256 616a30f260407f959874d35d351eaf73c74f7f8f016a7826286c88d923a4b1fc SHA512 870a794fdd729aa69b392c3d5cba764ee77141be16313adaf43089c82de397b64517e88d986ecc6f1766cdd5381fa103528ee214358e7b9398f7d4bd70d5f33c WHIRLPOOL 45d2831f593b609b4e4e774c0bf446dd98cb8ad4eba797baafbc43d8af4897764973066348dde08f97ae90635becbe3e91419fbc080d4fdb0a3771b8e63d3c89
-DIST hplip-3.12.11.tar.gz 21932088 SHA256 c5b81167b21aa4ee6bdf3f5c120bfa050d0c794608da8bcc32e2580234919ffa SHA512 78593060f60a906e993ed4b2753fc41e7dae7a35a7697b87008b730fb893b3f4c54d488b7bb0d2fca72bd356dc963b2c2ca68c2797c5860f7052141bd0a81ea7 WHIRLPOOL 7983dc0f08ed38e5ae3ac9bde28f900f1315ad6d6cbd5773221799ea6c9ad9225ea35cb5be8537e4f6045b23c56a9e1776b6b337c91b626afa4e91416b830252
-DIST hplip-3.12.4-patches-1.tar.xz 9048 SHA256 88924b3a7bca2350de57e7f1eca5632cb423ea105e8d2f958971d905a3882eba
-DIST hplip-3.12.4.tar.gz 20603723 SHA256 350375c78d79adf635a59a448b27b3fe9ab7ac622637c47125fe5f7d8a537fff
-DIST hplip-3.12.9-patches-2.tar.xz 10328 SHA256 d992fdf42bbcde92de9f4256308b3b35b74e3fcae50704d59eaf26bd2beab5b4 SHA512 846b9cc96b1eefcbc0960c312a60ab8913b6db109bfa828d19f1e9cdfccc47e193d582767d828437dbebc9ec1c0617a590e8f3f2e744d9f5bddb6056d43fe6a7 WHIRLPOOL 5d63763f11d8f91a6506301ec2c7e37c1f9e5693c83d818f67129a42c7489fd9ed09c0a06f216af72c21f488cefc6f2b455a010fc504e3fc7b12b877190e9d9b
-DIST hplip-3.12.9.tar.gz 21314003 SHA256 e7361b9d6e968ce3306dc438e622a4412156e7c2d71b2a6face5952cf52e23c4 SHA512 bf0f498d7516c4b7653799c043dd6336a620be31680e1419bf09f9fd52492fc92f59e030df5110f89615c16d27ecad0169c83c938651a7fa7257057ccf5d30eb WHIRLPOOL 1059cf4216b60752c4f6da299f2dd86bdb26be7171275107280953225a9d1d729b135ba0f7990a8ed757fd52880612718bd846abb68ecbf61652923db88ca425
-EBUILD hplip-3.12.10.ebuild 6751 SHA256 a0b565fa314882106ac0152ba6ef2bb447e59d9ef707146cbfe6fcc153a30c8f SHA512 3d9c7f1c9ad15ebe4427671017c48d65660c2aacd111eac8472604794a64efe2eea19c79d7b96e20358102a1e856064310cb6528026863417d09d0340d59f85a WHIRLPOOL 49dd7fe55155739efdfcec928b72652c060c4e184593bdd82ace30501e683a4c0e904531aad49e25c91630c035fc7d22827de33b27fa90c0038723f4ce5babc9
-EBUILD hplip-3.12.10a-r1.ebuild 7487 SHA256 abc9900e34432a364b5fe001d4621fe3d8bbe1aebe2362cb8556693013caa140 SHA512 e31f446359fadf50279b8553829cc60f3d3c591d113ae87502536b7490954de5be5e51b6df21e86b0fd1e9247e06621f53c357b459b98410fcb44fac5e191d68 WHIRLPOOL d818eb171b39e2b66a60e07c12674138e57b25545f6416c1a832602d1c51d014f5c1994c4e178618c313a57ef57dbbfc93e4e93135c4b29f7fd683e2da029d3f
-EBUILD hplip-3.12.10a.ebuild 6905 SHA256 70e29aa04aabc289ec5b927cc5ec9cb6dba24fc0cb2e626489389217d6e10ebe SHA512 741f46330d99ce41cb78036ef4878409fd5c619a5826d935c9712a1e1ec44d9cae336d6de30b34e6aacd3d501e6ba2f786da6de2a9123105c886a5ca883aa977 WHIRLPOOL 19258f9724fdb4a60892595ba0294e192cb778c6bedd7f4d797dd35f664ae84a75c0269e48c3191ff4df8c6ce5ae7e0f2b4c4e6dcde991c489cd785f76509c89
-EBUILD hplip-3.12.11-r1.ebuild 7741 SHA256 5049093454fea62e53143528b35103f2ffea831c3618ddf9071fcdc186d1873c SHA512 ccd89bbff9966b004b105ddfb5a49c5fb75f35a98493b319fb4a6fa864ea63d1fa8200d437274d87a70e9e8dc47fb7006f1a155d53a8fd8cb444df6a14f092cd WHIRLPOOL 02cffdf5b1c0da8b4ab59187c9475418ff51bf2ebe2f6f1564a54fc3594bc0498eb34eb1a4fadc426dbba66d01de0e3c47ba896c9cb73295c7b80d700ecf9ce2
-EBUILD hplip-3.12.11.ebuild 7510 SHA256 8fabb1056c1c2d84ab132ab85dec35f8f27f188dc6290a7cbc6fc1d663fae0a2 SHA512 ca9b2368c7e98346bd33d1db398165e502a231bbc5eda2f84e722a04c1f5bfa6097819b7d1b64686abc5b9d80b233d2d11fd5ad11bda2092cbc88765eb7d0998 WHIRLPOOL b444acb18e4a57972961cac6d6b183af9afd24082a5495520f1110348c3b928f087eb33cd88369632d627a0e6159b0674a4bf9950346f291ef40958ed0cc551a
-EBUILD hplip-3.12.4.ebuild 6571 SHA256 6b19b4fc4fabee8417108fad420f06a6e5696dacf2be56e5cca2a1ddf00a8903 SHA512 c9b3d55fd37083043c61d2a6fe4a2fadf04a786d36db02de7f785e6ffac2ed5b4a967040248aa9ecd878c7cf5bbaaa091e97b8ef1ea58896e133c6d2598f981c WHIRLPOOL b515cf171856a7f0e434af172c4cf6d5794faa11afcd5afb5f1b0a9aa18c9394394b8a1448e75355bb7205df2bd68e17be52769040b085286aec62ac6eb4cb37
-EBUILD hplip-3.12.9-r1.ebuild 6691 SHA256 62daa4c6ffa98d7944cbf8923a8b88c9a0b712e89cae12cc852e74f257e1c5a2 SHA512 af3aa9e91e815d88213cdd36a6595c60a61676036d648dd9209dfc538b82221a97af74420e3518d12fd5fb1eb35bc307c6e6404d699c6754abf4903944697433 WHIRLPOOL 8d9520851295dd0f706b14989f889f34b8509572903dfc0bc27c41ed7810927eca5fc5e5e30c0735f2046bd63ad824bdf14a50201a5eb3a18d53f9279cc178f0
diff --git a/net-print/hplip/files/hplip-3.10.9-cve-2010-4267.patch b/net-print/hplip/files/hplip-3.10.9-cve-2010-4267.patch
deleted file mode 100644
index 3bf6b84f..00000000
--- a/net-print/hplip/files/hplip-3.10.9-cve-2010-4267.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hplip-3.10.2.orig/io/hpmud/pml.c	2010-12-06 13:35:12.046894255 -0500
-+++ hplip-3.10.2.orig/io/hpmud/pml.c	2010-12-06 13:34:35.018894207 -0500
-@@ -504,6 +504,8 @@ enum HPMUD_RESULT hpmud_get_pml(HPMUD_DE
-       p += 2;                               /* eat type and length */
-    }
-    
-+   if (dLen > buf_size)
-+      dLen = buf_size;
-    memcpy(buf, p, dLen);
-    *bytes_read = dLen; 
-    *type = dt;
diff --git a/net-print/hplip/files/hplip-3.11.1-desktop.patch b/net-print/hplip/files/hplip-3.11.1-desktop.patch
deleted file mode 100644
index 0ed31ec0..00000000
--- a/net-print/hplip/files/hplip-3.11.1-desktop.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.am.old	2011-01-24 20:40:08.989802335 +0100
-+++ Makefile.am	2011-01-24 20:40:23.913135667 +0100
-@@ -332,6 +332,7 @@
- hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
- hppgsz_LDADD = libapdk.la -ljpeg -ldl
- 
-+if GUI_BUILD
- # hplip.desktop
- hplip_desktopdir = $(icondir)
- hplip_desktop_DATA = hplip.desktop
-@@ -339,6 +340,7 @@
- # hplip-systray.desktop
- hplip_systraydir = $(systraydir)
- hplip_systray_DATA = hplip-systray.desktop
-+endif
- 
- # hpipjs (CUPS filter)
- hplipjsdir = $(cupsfilterdir)
diff --git a/net-print/hplip/files/hplip-3.11.1-htmldir.patch b/net-print/hplip/files/hplip-3.11.1-htmldir.patch
deleted file mode 100644
index da9a7cba..00000000
--- a/net-print/hplip/files/hplip-3.11.1-htmldir.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -Naur hplip-3.11.1-old/configure.in hplip-3.11.1/configure.in
---- hplip-3.11.1-old/configure.in	2011-01-24 20:45:27.429802335 +0100
-+++ hplip-3.11.1/configure.in	2011-01-24 20:48:34.759802335 +0100
-@@ -327,6 +327,9 @@
- AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=DIR], [set hplip documentation directory [default=datadir/doc]]),
-    hpdocdir=$withval, hpdocdir="$datadir/doc/hplip-$VERSION")
- 
-+AC_ARG_WITH(htmldir, AC_HELP_STRING([--with-htmldir=DIR], [set hplip html documentation directory [default=datadir/doc]]),
-+   hphtmldir=$withval, hphtmldir="$datadir/doc/hplip-$VERSION")
-+
- AC_MSG_CHECKING([for foomatic ppd install])
- AC_ARG_ENABLE(foomatic_ppd_install,
-   [  --enable-foomatic-ppd-install    enable foomatic static ppd install (default=no), uses hpppddir],
-@@ -551,6 +554,7 @@
- AC_DEFINE_DIR([abs_sbindir], [sbindir])
- AC_DEFINE_DIR([abs_hpppddir], [hpppddir])
- AC_DEFINE_DIR([abs_docdir], [hpdocdir])
-+AC_DEFINE_DIR([abs_htmldir], [hphtmldir])
- abs_ppddir=${abs_hpppddir%/*}
- AC_DEFINE_DIR([abs_drvdir], [drvdir])
- 
-@@ -558,6 +562,7 @@
- AC_SUBST(abs_sbindir) 
- AC_SUBST(abs_hpppddir) 
- AC_SUBST(abs_docdir) 
-+AC_SUBST(abs_htmldir)
- AC_SUBST(abs_ppddir) 
- AC_SUBST(abs_drvdir) 
- AC_SUBST(abs_mimedir) 
-@@ -568,6 +573,7 @@
- AC_SUBST(cupsfilterdir)
- AC_SUBST(hpppddir)
- AC_SUBST(hpdocdir)
-+AC_SUBST(hphtmldir)
- AC_SUBST(drvdir)
- AC_SUBST(network_build)
- AC_SUBST(pp_build)
-diff -Naur hplip-3.11.1-old/hplip.conf.in hplip-3.11.1/hplip.conf.in
---- hplip-3.11.1-old/hplip.conf.in	2011-01-24 20:45:27.429802335 +0100
-+++ hplip-3.11.1/hplip.conf.in	2011-01-24 20:49:25.999802335 +0100
-@@ -9,6 +9,7 @@
- ppd=@abs_hpppddir@
- ppdbase=@abs_ppddir@
- doc=@abs_docdir@
-+html=@abs_htmldir@
- icon=@icondir@
- cupsbackend=@cupsbackenddir@
- cupsfilter=@cupsfilterdir@
-@@ -42,4 +43,4 @@
- lite-build=@lite_build@
- udev-acl-rules=@udev_acl_rules@
- hpcups-only-build=@hpcups_only_build@
--hpijs-only-build=@hpijs_only_build@
-\ Kein Zeilenumbruch am Dateiende.
-+hpijs-only-build=@hpijs_only_build@
-diff -Naur hplip-3.11.1-old/hplip.list.in hplip-3.11.1/hplip.list.in
---- hplip-3.11.1-old/hplip.list.in	2011-01-24 20:45:27.523135669 +0100
-+++ hplip-3.11.1/hplip.list.in	2011-01-24 20:50:25.959802335 +0100
-@@ -49,6 +49,7 @@
- $icondir=@icondir@
- $systraydir=@systraydir@
- $docdir=@hpdocdir@
-+$htmldir=@hphtmldirdir@
- $version=@VERSION@
- $internal_tag=@PACKAGE_BUGREPORT@
- 
-@@ -257,11 +258,11 @@
- @epm_full@f 644 root root $home/pcard/photocard.py pcard/photocard.py
- @epm_full@f 755 root root $home/info.py info.py
- # docs
--@epm_full@f 644 root root $docdir doc/*
--@epm_full@d 775 root root $docdir/images -
--@epm_full@f 644 root root $docdir/images doc/images/*
--@epm_full@d 775 root root $docdir/styles -
--@epm_full@f 644 root root $docdir/styles doc/styles/*
-+@epm_full@f 644 root root $htmldir doc/*
-+@epm_full@d 775 root root $htmldir/images -
-+@epm_full@f 644 root root $htmldir/images doc/images/*
-+@epm_full@d 775 root root $htmldir/styles -
-+@epm_full@f 644 root root $htmldir/styles doc/styles/*
- # python commands
- @epm_full@l 755 root root $bindir/hp-toolbox ../share/hplip/toolbox.py
- @epm_full@l 755 root root $bindir/hp-colorcal ../share/hplip/colorcal.py
-diff -Naur hplip-3.11.1-old/Makefile.am hplip-3.11.1/Makefile.am
---- hplip-3.11.1-old/Makefile.am	2011-01-24 20:45:27.429802335 +0100
-+++ hplip-3.11.1/Makefile.am	2011-01-24 20:51:45.893135668 +0100
-@@ -9,6 +9,7 @@
- hplipdir = $(datadir)/hplip
- 
- docdir = $(hpdocdir)
-+htmldir = $(hphtmldir)
- doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG
- EXTRA_DIST = prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch prnt/hpijs/README_LIBJPG copyright
- 
-@@ -23,11 +24,11 @@
- 
- if DOC_BUILD
- wwwsrc = doc
--www0dir = $(docdir)
-+www0dir = $(htmldir)
- dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html
--www3dir = $(docdir)/styles
-+www3dir = $(htmldir)/styles
- dist_www3_DATA = $(wwwsrc)/styles/*
--www4dir = $(docdir)/images
-+www4dir = $(htmldir)/images
- dist_www4_DATA = $(wwwsrc)/images/*
- endif
- 
diff --git a/net-print/hplip/files/hplip-3.11.10-udev-attrs.patch b/net-print/hplip/files/hplip-3.11.10-udev-attrs.patch
deleted file mode 100644
index e57f8f9a..00000000
--- a/net-print/hplip/files/hplip-3.11.10-udev-attrs.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff -Naur hplip-3.11.10-old/data/rules/55-hpmud.rules hplip-3.11.10/data/rules/55-hpmud.rules
---- hplip-3.11.10-old/data/rules/55-hpmud.rules	2011-10-15 14:11:06.143791977 +0200
-+++ hplip-3.11.10/data/rules/55-hpmud.rules	2011-10-15 14:11:16.083791723 +0200
-@@ -21,128 +21,128 @@
- LABEL="hplip_pid_test"
- 
- # Check for AiO products (0x03f0xx11).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660"
- 
- # Check for Photosmart products without wildcard since cameras and scanners also used (0x03f0xx02). 
- # The xx02 pid has been retired so this explicit list should not change.
- # photosmart_d2300_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_100
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_1115
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_1215
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_1218
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_130
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_1315
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_140_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_230
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_240_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_320_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_330_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_370_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_380_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_420_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_470_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_7150
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660"
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_7200_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_7345
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_7350 
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_7400_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_7550
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_7600_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_7700_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_7800_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_7900_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_8000_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_8100_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_8200_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_8400_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_8700_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a310_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a320_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a430_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a440_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a510_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a520_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a530_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a610_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a620_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a630_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a710_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_a820_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_d5060_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_d5100_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_d6100_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_d7100_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_d7300_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_pro_b8300_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_b8800_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660"
- # photosmart_pro_b9100_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660"
- # Photosmart_B8500_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660"
- # Photosmart_A640_series
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660"
- 
- # Check for Business Inkjet products (0x03f0xx12).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660"
- # Check for Deskjet products (0x03f0xx04).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660"
- # Check for LaserJet products (0x03f0xx17).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660"
- # Check for LaserJet products (0x03f0xx2a).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660"
- # Check for DesignJet product (0x03f0xx14).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="660"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="660"
- 
- # Removed the following rule because FHS states that /etc should be reserved for static files only. This
- # functionality should be done in a deb/rpm post install script.  2/11/2009, D Suffield
-diff -Naur hplip-3.11.10-old/data/rules/56-hpmud_support.rules hplip-3.11.10/data/rules/56-hpmud_support.rules
---- hplip-3.11.10-old/data/rules/56-hpmud_support.rules	2011-10-15 14:11:06.143791977 +0200
-+++ hplip-3.11.10/data/rules/56-hpmud_support.rules	2011-10-15 14:11:49.153790877 +0200
-@@ -7,9 +7,9 @@
- LABEL="pid_test"
- 
- # Check for LaserJet products (0x03f0xx17).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'"
- # Check for LaserJet products (0x03f0xx2a).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'"
- ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'"
- 
- LABEL="hpmud_rules_end"
diff --git a/net-print/hplip/files/hplip-3.9.10-browser.patch b/net-print/hplip/files/hplip-3.9.10-browser.patch
deleted file mode 100644
index 46c4f634..00000000
--- a/net-print/hplip/files/hplip-3.9.10-browser.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- base/utils.py.old	2009-11-14 15:23:29.000000000 +0100
-+++ base/utils.py	2009-11-14 15:37:53.000000000 +0100
-@@ -812,13 +812,15 @@
-     return True
- 
- 
--BROWSERS = ['firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order
--BROWSER_OPTS = {'firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''}
-+BROWSERS = ['firefox', 'mozilla', 'konqueror', 'epiphany', 'skipstone'] # in preferred order
-+BROWSER_OPTS = {'firefox': '-new-tab', 'mozilla': '', 'konqueror': '', 'epiphany': '--new-tab', 'skipstone': ''}
- 
- 
- def find_browser():
-     if platform_avail and platform.system() == 'Darwin':
-         return "open"
-+    if platform_avail and platform.system() == 'Linux' and which("xdg-open"):
-+        return "xdg-open"
-     else:
-         for b in BROWSERS:
-             if which(b):
-@@ -832,11 +834,14 @@
-         cmd = 'open "%s"' % url
-         log.debug(cmd)
-         os.system(cmd)
-+    if platform_avail and platform.system() == 'Linux' and which("xdg-open"):
-+        cmd = 'xdg-open "%s"' % url
-+        log.debug(cmd)
-+        os.system(cmd)
-     else:
-         for b in BROWSERS:
--            bb = which(b)
--            if bb:
--                bb = os.path.join(bb, b)
-+            if b:
-+                bb = which(b, return_full_path='True')
-                 if use_browser_opts:
-                     cmd = """%s %s "%s" &""" % (bb, BROWSER_OPTS[b], url)
-                 else:
diff --git a/net-print/hplip/files/hplip-3.9.12-cupsddk.patch b/net-print/hplip/files/hplip-3.9.12-cupsddk.patch
deleted file mode 100644
index b059c9bb..00000000
--- a/net-print/hplip/files/hplip-3.9.12-cupsddk.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur hplip-3.9.12-old/installer/core_install.py hplip-3.9.12/installer/core_install.py
---- hplip-3.9.12-old/installer/core_install.py	2009-12-15 22:22:13.000000000 +0100
-+++ hplip-3.9.12/installer/core_install.py	2009-12-20 02:11:47.000000000 +0100
-@@ -29,6 +29,7 @@
- import grp
- import pwd
- import tarfile
-+import commands # TODO: Replace with subprocess (commands is deprecated in Python 3.0)
- 
- try:
-     import hashlib # new in 2.5
-@@ -1036,9 +1037,8 @@
-     def check_cupsddk(self):
-         log.debug("Checking for cups-ddk...")
-         # TODO: Compute these paths some way or another...
--        #return check_tool("/usr/lib/cups/driver/drv list") and os.path.exists("/usr/share/cupsddk/include/media.defs")
--        return (check_file('drv', "/usr/lib/cups/driver") or check_file('drv', "/usr/lib64/cups/driver")) and \
--            check_file('media.defs', "/usr/share/cupsddk/include")
-+        #return check_tool(commands.getoutput("cups-config --serverbin") + "/driver/drv list") and os.path.exists("/usr/share/cupsddk/include/media.defs")
-+        return check_file('drv', commands.getoutput("cups-config --serverbin") + "/driver") and check_file('media.defs', "/usr/share/cupsddk/include")
- 
- 
-     def check_policykit(self):
diff --git a/net-print/hplip/files/hplip-3.9.12-systray.patch b/net-print/hplip/files/hplip-3.9.12-systray.patch
deleted file mode 100644
index 0ae053fa..00000000
--- a/net-print/hplip/files/hplip-3.9.12-systray.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-
-++ hplip-3.9.10/debian/patches/hplip-systray-longer-timeout-for-system-tray-start.dpatch
-
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## hplip-systray-longer-timeout-for-system-tray-start.dpatch by  <till.kamppeter@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad hplip-3.9.10~/ui4/systemtray.py hplip-3.9.10/ui4/systemtray.py
---- hplip-3.9.10~/ui4/systemtray.py	2009-11-17 21:23:42.000000000 +0100
-+++ hplip-3.9.10/ui4/systemtray.py	2009-11-29 21:34:01.399929476 +0100
-@@ -706,7 +706,7 @@
-     app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app
- 
-     i = 0
--    while i < 10:
-+    while i < 180:
-         if QSystemTrayIcon.isSystemTrayAvailable():
-             break
-         time.sleep(1.0)
diff --git a/net-print/hplip/hplip-3.12.10.ebuild b/net-print/hplip/hplip-3.12.10.ebuild
deleted file mode 100644
index 6f173587..00000000
--- a/net-print/hplip/hplip-3.12.10.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# 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.10.ebuild,v 1.2 2012/10/20 11:54:01 billie Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="!minimal? 2"
-PYTHON_USE_WITH="threads xml"
-PYTHON_USE_WITH_OPT="!minimal"
-
-inherit eutils fdo-mime linux-info python 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"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		http://dev.gentoo.org/~billie/distfiles/${P}-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-# zeroconf does not work properly with >=cups-1.4.
-# Thus support for it is also disabled in hplip.
-IUSE="+autostart doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds X"
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!minimal? (
-		>=net-print/cups-1.4.0
-		virtual/libusb:1
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( sys-apps/dbus )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl:0
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ghostscript-gpl-8.71-r3
-	dev-python/dbus-python
-	policykit? (
-		sys-auth/polkit
-	)
-	!minimal? (
-		dev-python/pygobject:2
-		kernel_linux? ( >=sys-fs/udev-114 )
-		scanner? (
-			dev-python/imaging
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-		fax? (
-			dev-python/reportlab
-			dev-python/dbus-python
-		)
-		qt4? (
-			dev-python/PyQt4[dbus,X]
-			libnotify? (
-				dev-python/notify-python
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-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 qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	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"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	use !minimal && python_convert_shebangs -q -r 2 .
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Fix for Gentoo bug #345725
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp || die
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || die
-		mv ${i}.temp ${i} || die
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	if use fax || use qt4 ; then
-		myconf="${myconf} --enable-dbus-build"
-	else
-		myconf="${myconf} --disable-dbus-build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-libusb01_build \
-		--disable-udev_sysfs_rules \
-		--disable-udev-acl-rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable qt4 gui-build) \
-		$(use_enable qt4) \
-		$(use_enable policykit)
-}
-
-src_install() {
-	default
-
-	# Installed by sane-backends
-	# Gentoo Bug: #201023
-	rm -f "${D}"/etc/sane.d/dll.conf || die
-
-	# bug 106035/259763
-	if ! use autostart || ! use qt4 ; then
-		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
-	fi
-
-	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${D}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -exec rm -rf {} + || die
-}
-
-pkg_postinst() {
-	use !minimal && python_mod_optimize /usr/share/${PN}
-	fdo-mime_desktop_database_update
-
-	elog "For more information on setting up your printer please take"
-	elog "a look at the hplip section of the gentoo printing guide:"
-	elog "http://www.gentoo.org/doc/en/printing-howto.xml"
-	elog
-	elog "Any user who wants to print must be in the lp group."
-}
-
-pkg_postrm() {
-	use !minimal && python_mod_cleanup /usr/share/${PN}
-	fdo-mime_desktop_database_update
-}
diff --git a/net-print/hplip/hplip-3.12.10a-r1.ebuild b/net-print/hplip/hplip-3.12.10a-r1.ebuild
deleted file mode 100644
index fd8ce690..00000000
--- a/net-print/hplip/hplip-3.12.10a-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# 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.10a-r1.ebuild,v 1.2 2012/12/11 17:01:02 axs Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="!minimal? 2"
-PYTHON_USE_WITH="threads xml"
-PYTHON_USE_WITH_OPT="!minimal"
-
-inherit eutils fdo-mime linux-info python 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"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		http://dev.gentoo.org/~billie/distfiles/${PN}-3.12.10-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-# zeroconf does not work properly with >=cups-1.4.
-# Thus support for it is also disabled in hplip.
-IUSE="+autostart doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!minimal? (
-		>=net-print/cups-1.4.0
-		!libusb0? ( virtual/libusb:1 )
-		libusb0? ( virtual/libusb:0 )
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( sys-apps/dbus )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl:0
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ghostscript-gpl-8.71-r3
-	dev-python/dbus-python
-	policykit? (
-		sys-auth/polkit
-	)
-	!minimal? (
-		dev-python/pygobject:2
-		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
-		scanner? (
-			dev-python/imaging
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-		fax? (
-			dev-python/reportlab
-			dev-python/dbus-python
-		)
-		qt4? (
-			dev-python/PyQt4[dbus,X]
-			libnotify? (
-				dev-python/notify-python
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-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 qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	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"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	use !minimal && python_convert_shebangs -q -r 2 .
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir="$(udev_get_udevdir)"
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp || die
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || die
-		mv ${i}.temp ${i} || die
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	if use fax || use qt4 ; then
-		myconf="${myconf} --enable-dbus-build"
-	else
-		myconf="${myconf} --disable-dbus-build"
-	fi
-
-	if use libusb0 ; then
-		myconf="${myconf} --enable-libusb01_build"
-	else
-		myconf="${myconf} --disable-libusb01_build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-udev_sysfs_rules \
-		--disable-udev-acl-rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable qt4 gui-build) \
-		$(use_enable qt4) \
-		$(use_enable policykit)
-}
-
-src_install() {
-	default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${D}"/etc/sane.d/dll.conf || die
-
-	# bug 106035/259763
-	if ! use autostart || ! use qt4 ; then
-		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
-	fi
-
-	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${D}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -exec rm -rf {} + || die
-}
-
-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:"
-		elog "http://www.gentoo.org/doc/en/printing-howto.xml"
-		elog
-		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
-}
diff --git a/net-print/hplip/hplip-3.12.10a.ebuild b/net-print/hplip/hplip-3.12.10a.ebuild
deleted file mode 100644
index 8fccc6e4..00000000
--- a/net-print/hplip/hplip-3.12.10a.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.10a.ebuild,v 1.10 2013/02/09 08:57:51 billie Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="!minimal? 2"
-PYTHON_USE_WITH="threads xml"
-PYTHON_USE_WITH_OPT="!minimal"
-
-inherit eutils fdo-mime linux-info python 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"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		http://dev.gentoo.org/~billie/distfiles/${PN}-3.12.10-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-
-# zeroconf does not work properly with >=cups-1.4.
-# Thus support for it is also disabled in hplip.
-IUSE="+autostart doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!minimal? (
-		>=net-print/cups-1.4.0
-		!libusb0? ( virtual/libusb:1 )
-		libusb0? ( virtual/libusb:0 )
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( sys-apps/dbus )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl:0
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ghostscript-gpl-8.71-r3
-	dev-python/dbus-python
-	policykit? (
-		sys-auth/polkit
-	)
-	!minimal? (
-		dev-python/pygobject:2
-		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
-		scanner? (
-			dev-python/imaging
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-		fax? (
-			dev-python/reportlab
-			dev-python/dbus-python
-		)
-		qt4? (
-			dev-python/PyQt4[dbus,X]
-			libnotify? (
-				dev-python/notify-python
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-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 qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	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"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	use !minimal && python_convert_shebangs -q -r 2 .
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Fix for Gentoo bug #345725
-	local udevdir="$(udev_get_udevdir)"
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp || die
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || die
-		mv ${i}.temp ${i} || die
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	if use fax || use qt4 ; then
-		myconf="${myconf} --enable-dbus-build"
-	else
-		myconf="${myconf} --disable-dbus-build"
-	fi
-
-	if use libusb0 ; then
-		myconf="${myconf} --enable-libusb01_build"
-	else
-		myconf="${myconf} --disable-libusb01_build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-udev_sysfs_rules \
-		--disable-udev-acl-rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable qt4 gui-build) \
-		$(use_enable qt4) \
-		$(use_enable policykit)
-}
-
-src_install() {
-	default
-
-	# Installed by sane-backends
-	# Gentoo Bug: #201023
-	rm -f "${D}"/etc/sane.d/dll.conf || die
-
-	# bug 106035/259763
-	if ! use autostart || ! use qt4 ; then
-		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
-	fi
-
-	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${D}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -exec rm -rf {} + || die
-}
-
-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:"
-		elog "http://www.gentoo.org/doc/en/printing-howto.xml"
-		elog
-		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
-}
diff --git a/net-print/hplip/hplip-3.12.11-r1.ebuild b/net-print/hplip/hplip-3.12.11-r1.ebuild
deleted file mode 100644
index d5b0186c..00000000
--- a/net-print/hplip/hplip-3.12.11-r1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.11-r1.ebuild,v 1.2 2013/02/09 09:07:31 billie Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="threads,xml"
-
-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"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		http://dev.gentoo.org/~billie/distfiles/${PN}-3.12.10-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-# zeroconf does not work properly with >=cups-1.4.
-# Thus support for it is also disabled in hplip.
-IUSE="+autostart 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, 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 )
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( sys-apps/dbus )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl:0
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ghostscript-gpl-8.71-r3
-	>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
-	policykit? (
-		sys-auth/polkit
-	)
-	!minimal? (
-		>=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}]
-		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
-		scanner? (
-			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-			>=dev-python/imaging-1.1.7-r2[${PYTHON_USEDEP}]
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-		fax? (
-			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-			>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
-		)
-		qt4? (
-			>=dev-python/PyQt4-4.9.6-r2[dbus,X,${PYTHON_USEDEP}]
-			libnotify? (
-				dev-python/notify-python
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-pkg_setup() {
-	use !minimal && python-single-r1_pkg_setup
-
-	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	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"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	if use !minimal ; then
-		python_export EPYTHON PYTHON
-		python_fix_shebang .
-	fi
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir="$(udev_get_udevdir)"
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp || die
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || die
-		mv ${i}.temp ${i} || die
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	if use fax || use qt4 ; then
-		myconf="${myconf} --enable-dbus-build"
-	else
-		myconf="${myconf} --disable-dbus-build"
-	fi
-
-	if use libusb0 ; then
-		myconf="${myconf} --enable-libusb01_build"
-	else
-		myconf="${myconf} --disable-libusb01_build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-udev_sysfs_rules \
-		--disable-udev-acl-rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable qt4 gui-build) \
-		$(use_enable qt4) \
-		$(use_enable policykit)
-}
-
-src_install() {
-	default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${D}"/etc/sane.d/dll.conf || die
-
-	# bug 106035/259763
-	if ! use autostart || ! use qt4 ; then
-		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
-	fi
-
-	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	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() {
-	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:"
-		elog "http://www.gentoo.org/doc/en/printing-howto.xml"
-		elog
-		elog "Any user who wants to print must be in the lp group."
-	fi
-}
diff --git a/net-print/hplip/hplip-3.12.11.ebuild b/net-print/hplip/hplip-3.12.11.ebuild
deleted file mode 100644
index 4ca485c3..00000000
--- a/net-print/hplip/hplip-3.12.11.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.11.ebuild,v 1.4 2013/02/09 09:07:31 billie Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="!minimal? 2"
-PYTHON_USE_WITH="threads xml"
-PYTHON_USE_WITH_OPT="!minimal"
-
-inherit eutils fdo-mime linux-info python 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"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		http://dev.gentoo.org/~billie/distfiles/${PN}-3.12.10-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-# zeroconf does not work properly with >=cups-1.4.
-# Thus support for it is also disabled in hplip.
-IUSE="+autostart doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!minimal? (
-		>=net-print/cups-1.4.0
-		!libusb0? ( virtual/libusb:1 )
-		libusb0? ( virtual/libusb:0 )
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( sys-apps/dbus )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl:0
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ghostscript-gpl-8.71-r3
-	dev-python/dbus-python
-	policykit? (
-		sys-auth/polkit
-	)
-	!minimal? (
-		dev-python/pygobject:2
-		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
-		scanner? (
-			dev-python/reportlab
-			dev-python/imaging
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-		fax? (
-			dev-python/reportlab
-			dev-python/dbus-python
-		)
-		qt4? (
-			dev-python/PyQt4[dbus,X]
-			libnotify? (
-				dev-python/notify-python
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-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 qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	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"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	use !minimal && python_convert_shebangs -q -r 2 .
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir="$(udev_get_udevdir)"
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp || die
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || die
-		mv ${i}.temp ${i} || die
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	if use fax || use qt4 ; then
-		myconf="${myconf} --enable-dbus-build"
-	else
-		myconf="${myconf} --disable-dbus-build"
-	fi
-
-	if use libusb0 ; then
-		myconf="${myconf} --enable-libusb01_build"
-	else
-		myconf="${myconf} --disable-libusb01_build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-udev_sysfs_rules \
-		--disable-udev-acl-rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable qt4 gui-build) \
-		$(use_enable qt4) \
-		$(use_enable policykit)
-}
-
-src_install() {
-	default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${D}"/etc/sane.d/dll.conf || die
-
-	# bug 106035/259763
-	if ! use autostart || ! use qt4 ; then
-		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
-	fi
-
-	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${D}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -exec rm -rf {} + || die
-}
-
-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:"
-		elog "http://www.gentoo.org/doc/en/printing-howto.xml"
-		elog
-		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
-}
diff --git a/net-print/hplip/hplip-3.12.4.ebuild b/net-print/hplip/hplip-3.12.4.ebuild
deleted file mode 100644
index d538b41a..00000000
--- a/net-print/hplip/hplip-3.12.4.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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.10 2012/10/20 11:54:01 billie Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="!minimal? 2"
-PYTHON_USE_WITH="threads xml"
-PYTHON_USE_WITH_OPT="!minimal"
-
-inherit eutils fdo-mime linux-info python autotools
-
-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
-		http://dev.gentoo.org/~billie/distfiles/${P}-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-
-# zeroconf does not work properly with >=cups-1.4.
-# Thus support for it is also disabled in hplip.
-IUSE="+autostart doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds X"
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!minimal? (
-		>=net-print/cups-1.4.0
-		virtual/libusb:0
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( sys-apps/dbus )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ghostscript-gpl-8.71-r3
-	policykit? (
-		sys-auth/polkit
-	)
-	!minimal? (
-		dev-python/pygobject:2
-		kernel_linux? ( >=sys-fs/udev-114 )
-		scanner? (
-			dev-python/imaging
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-		fax? (
-			dev-python/reportlab
-			dev-python/dbus-python
-		)
-		qt4? (
-			dev-python/PyQt4[dbus,X]
-			libnotify? (
-				dev-python/notify-python
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-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 qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	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"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-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
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp || die
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || die
-		mv ${i}.temp ${i} || die
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	if use fax || use qt4 ; then
-		myconf="${myconf} --enable-dbus-build"
-	else
-		myconf="${myconf} --disable-dbus-build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-udev-acl-rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable qt4 gui-build) \
-		$(use_enable qt4) \
-		$(use_enable policykit)
-}
-
-src_install() {
-	default
-
-	# Installed by sane-backends
-	# Gentoo Bug: #201023
-	rm -f "${D}"/etc/sane.d/dll.conf || die
-
-	# bug 106035/259763
-	if ! use autostart || ! use qt4 ; then
-		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
-	fi
-
-	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${D}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die
-}
-
-pkg_postinst() {
-	use !minimal && python_mod_optimize /usr/share/${PN}
-	fdo-mime_desktop_database_update
-
-	elog "For more information on setting up your printer please take"
-	elog "a look at the hplip section of the gentoo printing guide:"
-	elog "http://www.gentoo.org/doc/en/printing-howto.xml"
-	elog
-	elog "Any user who want to print must be in the lp group."
-}
-
-pkg_postrm() {
-	use !minimal && python_mod_cleanup /usr/share/${PN}
-	fdo-mime_desktop_database_update
-}
diff --git a/net-print/hplip/hplip-3.12.9-r1.ebuild b/net-print/hplip/hplip-3.12.9-r1.ebuild
deleted file mode 100644
index f7bde3ae..00000000
--- a/net-print/hplip/hplip-3.12.9-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# 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.9-r1.ebuild,v 1.7 2012/12/11 17:01:02 axs Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="!minimal? 2"
-PYTHON_USE_WITH="threads xml"
-PYTHON_USE_WITH_OPT="!minimal"
-
-inherit eutils fdo-mime linux-info python 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"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		http://dev.gentoo.org/~billie/distfiles/${P}-patches-2.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-
-# zeroconf does not work properly with >=cups-1.4.
-# Thus support for it is also disabled in hplip.
-IUSE="+autostart doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds X"
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!minimal? (
-		>=net-print/cups-1.4.0
-		virtual/libusb:1
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( sys-apps/dbus )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl:0
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ghostscript-gpl-8.71-r3
-	dev-python/dbus-python
-	policykit? (
-		sys-auth/polkit
-	)
-	!minimal? (
-		dev-python/pygobject:2
-		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
-		scanner? (
-			dev-python/imaging
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-		fax? (
-			dev-python/reportlab
-			dev-python/dbus-python
-		)
-		qt4? (
-			dev-python/PyQt4[dbus,X]
-			libnotify? (
-				dev-python/notify-python
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-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 qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	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"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	use !minimal && python_convert_shebangs -q -r 2 .
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Fix for Gentoo bug #345725
-	local udevdir="$(udev_get_udevdir)"
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp || die
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || die
-		mv ${i}.temp ${i} || die
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	if use fax || use qt4 ; then
-		myconf="${myconf} --enable-dbus-build"
-	else
-		myconf="${myconf} --disable-dbus-build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-libusb01_build \
-		--disable-udev_sysfs_rules \
-		--disable-udev-acl-rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable qt4 gui-build) \
-		$(use_enable qt4) \
-		$(use_enable policykit)
-}
-
-src_install() {
-	default
-
-	# Installed by sane-backends
-	# Gentoo Bug: #201023
-	rm -f "${D}"/etc/sane.d/dll.conf || die
-
-	# bug 106035/259763
-	if ! use autostart || ! use qt4 ; then
-		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
-	fi
-
-	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${D}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -exec rm -rf {} + || die
-}
-
-pkg_postinst() {
-	use !minimal && python_mod_optimize /usr/share/${PN}
-	fdo-mime_desktop_database_update
-
-	elog "For more information on setting up your printer please take"
-	elog "a look at the hplip section of the gentoo printing guide:"
-	elog "http://www.gentoo.org/doc/en/printing-howto.xml"
-	elog
-	elog "Any user who wants to print must be in the lp group."
-}
-
-pkg_postrm() {
-	use !minimal && python_mod_cleanup /usr/share/${PN}
-	fdo-mime_desktop_database_update
-}
diff --git a/net-print/xerox-phaser6000-drivers/Manifest b/net-print/xerox-phaser6000-drivers/Manifest
deleted file mode 100644
index d0fceb84..00000000
--- a/net-print/xerox-phaser6000-drivers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST 6000_6010_rpm_1.01_20110222.zip 462888 SHA256 3cb437d2a83fe18718ee73f0293cef17b7129f16e7302c94752e93b4e9152ff2 SHA512 37a72fafdaa3e874c12b9678d2754c43d86d7f057ecc5aa3e3d628f871150083c0fa2813ba7b2e9cb6c8d87bb319447218e32705b00a3af0a37a5cc38aed6ff0 WHIRLPOOL b5b01345b0266022ceaaa9c08d6a4553f1abc4472d332ecf9e37fe57e8535c5463123efb407e5cdc192012bc7d8d1c3a95db1c57caf7b2a6b9077ec95306c005
diff --git a/net-print/xerox-phaser6000-drivers/xerox-phaser6000-drivers-20110222.ebuild b/net-print/xerox-phaser6000-drivers/xerox-phaser6000-drivers-20110222.ebuild
deleted file mode 100644
index f16cd523..00000000
--- a/net-print/xerox-phaser6000-drivers/xerox-phaser6000-drivers-20110222.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Sabayon
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_PV="1.01"
-
-DESCRIPTION="CUPS filters and drivers for Xerox Phaser 6000B and 6010"
-HOMEPAGE="http://www.support.xerox.com/support/phaser-6000"
-SRC_URI="http://download.support.xerox.com/pub/drivers/6000/drivers/linux/en_GB/6000_6010_rpm_${MY_PV}_${PV}.zip"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip app-arch/rpm2targz sys-apps/findutils"
-RDEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs )
-	net-print/cups"
-
-S="${WORKDIR}/rpm_${MY_PV}_${PV}"
-RESTRICT="strip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	mkdir -p "${S}/out"
-
-	local fs=( *.rpm )
-	local f=
-	for f in "${fs[@]}"; do
-		rpm2tar -O "${f}" | tar -x -v -C "${S}/out" -f - || die
-	done
-}
-
-src_install() {
-	find "${S}/out" -name "*.ppd.gz" -delete || die
-	cp -d -p --recursive "${S}/out/"* "${ED}/" || die
-
-	insinto /usr/share/cups/model
-	doins "${S}"/*.ppd.gz || die "missing ppd files"
-}
author	V3n3RiX <venerix@rogentos.ro>	2016-08-11 00:33:31 +0100
committer	V3n3RiX <venerix@rogentos.ro>	2016-08-11 00:33:31 +0100
commit	ff5dd7b3704b9e8f9f606d4929f95694ec84ddf3 (patch)
tree	393b3bd8a65eb3ec464babab42da8d9ec88851c3 /net-print
parent	4c05e04608db666140daaa94499f5f90521a2cc4 (diff)