From 981fa48ae94172c178a88ac4b1e1bde6555871fc Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 24 Nov 2017 20:16:33 +0000
Subject: media-gfx/scangearmp : don't throw away libraries randomly please

---
 media-gfx/scangearmp/scangearmp-2.10-r1.ebuild | 210 ------------------------
 media-gfx/scangearmp/scangearmp-2.10-r2.ebuild | 219 +++++++++++++++++++++++++
 2 files changed, 219 insertions(+), 210 deletions(-)
 delete mode 100644 media-gfx/scangearmp/scangearmp-2.10-r1.ebuild
 create mode 100644 media-gfx/scangearmp/scangearmp-2.10-r2.ebuild

diff --git a/media-gfx/scangearmp/scangearmp-2.10-r1.ebuild b/media-gfx/scangearmp/scangearmp-2.10-r1.ebuild
deleted file mode 100644
index 94e135bb..00000000
--- a/media-gfx/scangearmp/scangearmp-2.10-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Changelog since last bugzilla upload
-#
-# initial version
-# updated to use cnijfilter-common-2.80 2008-01-12 by Victor Mataré
-#
-# 2010-03-19 GuS Version 3.20-r1
-#        Replaced dependency of non-existing dev-libs/libxml with
-#            dependency of >=dev-libs/libxml2-2.7.3-r2.
-#
-# 2010-03-20 GuS Version 3.20-r2
-#            Replaced dependency of non-existing virtual/ghostscript with
-#        dependency of app-text/ghostscript-gpl.
-#
-# 2013-05-31 andmarios 1.0 version for scangearmp 2.10
-#		Changed support to scangearmp 2.10 (mx390, mx450, mx520, mx720, mx920, e610)
-#		Set dev-libs/libusb to (0) slot, to avoid dependency problems with libusbx
-#		Dropped the /usr/local path as it wasn't being correctly used in my system
-#		Dropped the fixcompile.patch as it is needed anymore (?)
-#		Removed trailing spaces
-
-
-EAPI="4"
-
-inherit eutils flag-o-matic autotools multilib
-
-DESCRIPTION="Canon InkJet Scanner Driver and ScanGear MP for Linux (Pixus/Pixma-Series)."
-HOMEPAGE="http://support-au.canon.com.au/contents/AU/EN/0100518402.html"
-RESTRICT="nomirror confcache"
-
-SRC_URI="http://gdlp01.c-wss.com/gds/4/0100005184/01/scangearmp-source-2.10-1.tar.gz"
-LICENSE="UNKNOWN" # GPL-2 source and proprietary binaries
-
-SLOT="2"
-KEYWORDS="x86 amd64"
-IUSE="+usb
-    +mx720
-    +mx920
-    +mx390
-    +mx450
-    +mx520
-    +e610"
-DEPEND=">=media-libs/libpng-1.2.44
-	>=media-gfx/gimp-2.6.8
-	>=x11-libs/gtk+-2.20.1-r1
-	>=media-gfx/sane-backends-1.0.19-r2
-	dev-libs/libusb-compat
-	>=net-print/cnijfilter-4.0"
-RDEPEND="${DEPEND}"
-
-# Arrays of supported Printers, there IDs and compatible models
-_pruse=("mx720" "mx920" "mx390" "mx450" "mx520" "e610")
-_prname=(${_pruse[@]})
-_prid=("416" "417" "418" "419" "420" "421")
-_prcomp=("mx720series" "mx920series" "mx390series" "mx450series" "mx520series" "e610series")
-_max=$((${#_pruse[@]}-1)) # used for iterating through these arrays
-
-###
-#   Standard Ebuild-functions
-###
-
-src_unpack() {
-    unpack ${A}
-    mv ${PN}-source-${PV}-1 ${P} || die # Correcting directory-structure
-}
-
-pkg_setup() {
-    if [ -z "$LINGUAS" ]; then    # -z tests to see if the argument is empty
-        ewarn "You didn't specify 'LINGUAS' in your make.conf. Assuming"
-        ewarn "English localisation, i.e. 'LINGUAS=\"en\"'."
-        LINGUAS="en"
-    fi
-
-    _prefix="/usr/"
-    _bindir="${_prefix}/bin"
-    _libdir="/usr/$(get_libdir)" # either lib or lib32
-    _gimpdir="${_libdir}/gimp/2.0/plug-ins"
-    _udevdir="/etc/udev/rules.d"
-
-    einfo ""
-    einfo " USE-flags\t(description / probably compatible printers)"
-    einfo ""
-    einfo " amd64\t(basic support for this architecture)"
-    einfo " usb\t(connected using usb)"
-    _autochoose="true"
-    for i in `seq 0 ${_max}`; do
-        einfo " ${_pruse[$i]}\t${_prcomp[$i]}"
-        if (use ${_pruse[$i]}); then
-            _autochoose="false"
-        fi
-    done
-    einfo ""
-    if (${_autochoose}); then
-        ewarn "You didn't specify any driver model (set it's USE-flag)."
-        einfo ""
-        einfo "As example:\tbasic MX525 support without maintenance tools"
-        einfo "\t\t -> USE=\"mx520\""
-        einfo ""
-        einfo "Press Ctrl+C to abort"
-        echo
-
-        n=15 
-        while [[ $n -gt 0 ]]; do
-            echo -en "  Waiting $n seconds...\r"
-            sleep 1
-            (( n-- ))
-        done
-    fi
-}
-
-src_prepare(){
-	epatch ${FILESDIR}/link-against-mathlib.patch
-	cd scangearmp
-
-	sed -i 's/Z_BEST_SPEED/\ 1\ /g' src/scanfile.c
-
-	eautoreconf
-}
-
-src_configure(){
-    cd scangearmp || die
-
-    if use x86; then
-        LDFLAGS="-L$(pwd)/../com/libs_bin32"
-    elif use amd64 ; then
-        LDFLAGS="-L$(pwd)/../com/libs_bin64"
-    else
-		die "not supported arch"
-    fi
-
-    econf LDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-
-    cd scangearmp || die
-
-    make || die "Couldn't make scangearmp"
-
-    cd ..
-}
-
-src_install() {
-    mkdir -p ${D}${_bindir} || die
-    mkdir -p ${D}${_libdir}/bjlib || die
-    if use usb; then
-        mkdir -p ${D}${_udevdir} || die
-    fi
-
-    cd scangearmp || die
-    make DESTDIR=${D} install || die "Couldn't make install scangearmp"
-
-    cd ..
-
-    for i in $(seq 0 ${_max}); do
-        if use ${_pruse[$i]} || ${_autochoose}; then
-            _pr=${_prname[$i]} _prid=${_prid[$i]}
-        fi
-    done
-
-    # rm .1a and .a
-    rm -f {$D}${_libdir}/*.1a {$D}${_libdir}/*.a || die
-
-    # make symbolic link for gimp-plug-in
-    if [ -d "${_gimpdir}" ]; then
-        mkdir -p ${D}${_gimpdir} || die
-        dosym ${_bindir}/scangearmp ${_gimpdir}/scangearmp || die
-    fi
-
-    if use x86; then
-        cp -a ${_prid}/libs_bin32/* ${D}${_libdir} || die
-        cp -a com/libs_bin32/* ${D}${_libdir} || die
-    else # amd54
-        cp -a ${_prid}/libs_bin64/* ${D}${_libdir} || die
-        cp -a com/libs_bin64/* ${D}${_libdir} || die
-    fi
-    cp -a ${_prid}/*.DAT ${D}${_libdir}/bjlib || die
-    cp -a ${_prid}/*.tbl ${D}${_libdir}/bjlib || die
-    cp com/ini/canon_mfp_net.ini ${D}${_libdir}/bjlib || die
-    chmod 644 ${D}${_libdir}/bjlib/* || die
-    chmod 666 ${D}${_libdir}/bjlib/canon_mfp_net.ini || die
-
-    # usb
-    if use usb; then
-        cp -a scangearmp/etc/80-canon_mfp.rules ${D}${_udevdir} || die
-        chmod 644 ${D}${_udevdir}/80-canon_mfp.rules || die
-    fi
-}
-
-pkg_postinst() {
-    if use usb; then
-        if [ -x /sbin/udevadm ]; then
-            einfo ""
-            einfo "Reloading usb rules..."
-            /sbin/udevadm control --reload-rules 2> /dev/null
-            /sbin/udevadm trigger --action=add --subsystem-match=usb 2>/dev/null
-        else
-            einfo ""
-            einfo "Please, reload usb rules manually."
-        fi
-    fi
-
-    einfo ""
-    einfo "If you experience any problems, please visit:"
-    einfo " http://forums.gentoo.org/viewtopic-p-3217721.html"
-    einfo ""
-}
diff --git a/media-gfx/scangearmp/scangearmp-2.10-r2.ebuild b/media-gfx/scangearmp/scangearmp-2.10-r2.ebuild
new file mode 100644
index 00000000..f4e28314
--- /dev/null
+++ b/media-gfx/scangearmp/scangearmp-2.10-r2.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Changelog since last bugzilla upload
+#
+# initial version
+# updated to use cnijfilter-common-2.80 2008-01-12 by Victor Mataré
+#
+# 2010-03-19 GuS Version 3.20-r1
+#        Replaced dependency of non-existing dev-libs/libxml with
+#            dependency of >=dev-libs/libxml2-2.7.3-r2.
+#
+# 2010-03-20 GuS Version 3.20-r2
+#            Replaced dependency of non-existing virtual/ghostscript with
+#        dependency of app-text/ghostscript-gpl.
+#
+# 2013-05-31 andmarios 1.0 version for scangearmp 2.10
+#		Changed support to scangearmp 2.10 (mx390, mx450, mx520, mx720, mx920, e610)
+#		Set dev-libs/libusb to (0) slot, to avoid dependency problems with libusbx
+#		Dropped the /usr/local path as it wasn't being correctly used in my system
+#		Dropped the fixcompile.patch as it is needed anymore (?)
+#		Removed trailing spaces
+
+
+EAPI="4"
+
+inherit eutils flag-o-matic autotools multilib
+
+DESCRIPTION="Canon InkJet Scanner Driver and ScanGear MP for Linux (Pixus/Pixma-Series)."
+HOMEPAGE="http://support-au.canon.com.au/contents/AU/EN/0100518402.html"
+RESTRICT="nomirror confcache"
+
+SRC_URI="http://gdlp01.c-wss.com/gds/4/0100005184/01/scangearmp-source-2.10-1.tar.gz"
+LICENSE="UNKNOWN" # GPL-2 source and proprietary binaries
+
+SLOT="2"
+KEYWORDS="x86 amd64"
+IUSE="+usb
+    +mx720
+    +mx920
+    +mx390
+    +mx450
+    +mx520
+    +e610"
+DEPEND=">=media-libs/libpng-1.2.44
+	>=media-gfx/gimp-2.6.8
+	>=x11-libs/gtk+-2.20.1-r1
+	>=media-gfx/sane-backends-1.0.19-r2
+	dev-libs/libusb-compat
+	>=net-print/cnijfilter-4.0"
+RDEPEND="${DEPEND}"
+
+# Arrays of supported Printers, there IDs and compatible models
+_pruse=("mx720" "mx920" "mx390" "mx450" "mx520" "e610")
+_prname=(${_pruse[@]})
+_prid=("416" "417" "418" "419" "420" "421")
+_prcomp=("mx720series" "mx920series" "mx390series" "mx450series" "mx520series" "e610series")
+_max=$((${#_pruse[@]}-1)) # used for iterating through these arrays
+
+###
+#   Standard Ebuild-functions
+###
+
+src_unpack() {
+    unpack ${A}
+    mv ${PN}-source-${PV}-1 ${P} || die # Correcting directory-structure
+}
+
+pkg_setup() {
+    if [ -z "$LINGUAS" ]; then    # -z tests to see if the argument is empty
+        ewarn "You didn't specify 'LINGUAS' in your make.conf. Assuming"
+        ewarn "English localisation, i.e. 'LINGUAS=\"en\"'."
+        LINGUAS="en"
+    fi
+
+    _prefix="/usr/"
+    _bindir="${_prefix}/bin"
+    _libdir32="/usr/lib32"
+    _libdir64="/usr/lib64"
+    _gimpdir="${_libdir}/gimp/2.0/plug-ins"
+    _udevdir="/etc/udev/rules.d"
+
+    einfo ""
+    einfo " USE-flags\t(description / probably compatible printers)"
+    einfo ""
+    einfo " amd64\t(basic support for this architecture)"
+    einfo " usb\t(connected using usb)"
+    _autochoose="true"
+    for i in `seq 0 ${_max}`; do
+        einfo " ${_pruse[$i]}\t${_prcomp[$i]}"
+        if (use ${_pruse[$i]}); then
+            _autochoose="false"
+        fi
+    done
+    einfo ""
+    if (${_autochoose}); then
+        ewarn "You didn't specify any driver model (set it's USE-flag)."
+        einfo ""
+        einfo "As example:\tbasic MX525 support without maintenance tools"
+        einfo "\t\t -> USE=\"mx520\""
+        einfo ""
+        einfo "Press Ctrl+C to abort"
+        echo
+
+        n=15 
+        while [[ $n -gt 0 ]]; do
+            echo -en "  Waiting $n seconds...\r"
+            sleep 1
+            (( n-- ))
+        done
+    fi
+}
+
+src_prepare(){
+	epatch ${FILESDIR}/link-against-mathlib.patch
+	cd scangearmp
+
+	sed -i 's/Z_BEST_SPEED/\ 1\ /g' src/scanfile.c
+
+	eautoreconf
+}
+
+src_configure(){
+    cd scangearmp || die
+
+    if use x86; then
+        LDFLAGS="-L$(pwd)/../com/libs_bin32"
+    elif use amd64 ; then
+        LDFLAGS="-L$(pwd)/../com/libs_bin64"
+    else
+		die "not supported arch"
+    fi
+
+    econf LDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+
+    cd scangearmp || die
+
+    make || die "Couldn't make scangearmp"
+
+    cd ..
+}
+
+src_install() {
+    mkdir -p ${D}${_bindir} || die
+    mkdir -p ${D}${_libdir}/bjlib || die
+    if use usb; then
+        mkdir -p ${D}${_udevdir} || die
+    fi
+
+    cd scangearmp || die
+    make DESTDIR=${D} install || die "Couldn't make install scangearmp"
+
+    cd ..
+
+    for i in $(seq 0 ${_max}); do
+        if use ${_pruse[$i]} || ${_autochoose}; then
+            _pr=${_prname[$i]} _prid=${_prid[$i]}
+        fi
+    done
+
+    # rm .1a and .a
+    rm -f {$D}${_libdir}/*.1a {$D}${_libdir}/*.a || die
+
+    # make symbolic link for gimp-plug-in
+    if [ -d "${_gimpdir}" ]; then
+        mkdir -p ${D}${_gimpdir} || die
+        dosym ${_bindir}/scangearmp ${_gimpdir}/scangearmp || die
+    fi
+
+    if use x86; then
+        cp -a ${_prid}/libs_bin32/* ${D}${_libdir32} || die
+        cp -a com/libs_bin32/* ${D}${_libdir32} || die
+    else # amd54
+        cp -a ${_prid}/libs_bin64/* ${D}${_libdir64} || die
+        cp -a com/libs_bin64/* ${D}${_libdir64} || die
+    fi
+	if use x86; then
+		cp -a ${_prid}/*.DAT ${D}${_libdir32}/bjlib || die
+		cp -a ${_prid}/*.tbl ${D}${_libdir32}/bjlib || die
+		cp com/ini/canon_mfp_net.ini ${D}${_libdir32}/bjlib || die
+		chmod 644 ${D}${_libdir32}/bjlib/* || die
+		chmod 666 ${D}${_libdir32}/bjlib/canon_mfp_net.ini || die
+	else # amd64
+		cp -a ${_prid}/*.DAT ${D}${_libdir64}/bjlib || die
+		cp -a ${_prid}/*.tbl ${D}${_libdir64}/bjlib || die
+		cp com/ini/canon_mfp_net.ini ${D}${_libdir64}/bjlib || die
+		chmod 644 ${D}${_libdir64}/bjlib/* || die
+		chmod 666 ${D}${_libdir64}/bjlib/canon_mfp_net.ini || die
+	fi
+
+    # usb
+    if use usb; then
+        cp -a scangearmp/etc/80-canon_mfp.rules ${D}${_udevdir} || die
+        chmod 644 ${D}${_udevdir}/80-canon_mfp.rules || die
+    fi
+}
+
+pkg_postinst() {
+    if use usb; then
+        if [ -x /sbin/udevadm ]; then
+            einfo ""
+            einfo "Reloading usb rules..."
+            /sbin/udevadm control --reload-rules 2> /dev/null
+            /sbin/udevadm trigger --action=add --subsystem-match=usb 2>/dev/null
+        else
+            einfo ""
+            einfo "Please, reload usb rules manually."
+        fi
+    fi
+
+    einfo ""
+    einfo "If you experience any problems, please visit:"
+    einfo " http://forums.gentoo.org/viewtopic-p-3217721.html"
+    einfo ""
+}
-- 
cgit v1.2.3