[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: fa253e9766d67697c3aa792425e49f8f7a0d1b28
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:54:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa253e97

net-print/hpuld: fix 860336,860339

Add missing libusb RDEPEND

Closes: https://bugs.gentoo.org/860336
Closes: https://bugs.gentoo.org/860339
Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 111 +++
 1 file changed, 111 insertions(+)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
new file mode 100644
index 0..e94749ba6
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   dev-libs/libusb
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+# Do not complain about CFLAGS etc since it is binary package
+QA_FLAGS_IGNORED=".*"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
+
+   sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
+   else
+   sh ./install-printer.sh || die
+   fi
+}
+
+pkg_postinst() {
+   if use scanner ; then
+   ewarn "If you want to use the scanner,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
+   ewarn "please comment out it."
+
+   ewarn "You should restart cupsd service after installed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}
+
+pkg_postrm() {
+   if use scanner ; then
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: ebc6daae79b138fac98f5dad4423a79d7cc773eb
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:55:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:55:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ebc6daae

net-print/hpuld: drop 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 114 --
 1 file changed, 114 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
deleted file mode 100644
index 1d31577a8..0
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-MY_PV="$(ver_rs 4 _)"
-SANE_CONF_DIR="/etc/sane.d"
-
-DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
-HOMEPAGE="https://support.hp.com";
-
-SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
-"
-
-S="${WORKDIR}/uld"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-
-IUSE="+scanner"
-
-RDEPEND="
-   net-print/cups
-   scanner? (
-   media-gfx/sane-backends
-   )
-"
-
-DEPEND="
-   ${RDEPEND}
-"
-
-BDEPEND="
-   app-arch/unzip
-"
-
-QA_FLAGS_IGNORED="
-   /opt/smfp-common/scanner/lib/libsane-smfp.*
-   /opt/smfp-common/printer/bin/pstosecps
-   /opt/smfp-common/printer/bin/rastertospl
-   /opt/smfp-common/printer/bin/smfpnetdiscovery
-"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-   default
-
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
-   done
-}
-
-src_install() {
-   export AGREE_EULA="y"
-   export CONTINUE_INSTALL="y"
-   export PAGER="$(which cat)"
-
-   # Fix printer install path
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
-   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
-   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
-   # Not use rpm and dpkg
-   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
-   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
-
-   # Fix scanner install path
-   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
-   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
-   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
-   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
-   mkdir -p "${D}"/etc/hotplug/usb || die
-
-   if use scanner ; then
-   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
-   echo "smfp" > "${S}"/"${PN}".conf || die
-   insinto ${SANE_CONF_DIR}/dll.d
-   doins "${S}"/"${PN}".conf
-
-   sh ./install.sh || die
-   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
-   else
-   sh ./install-printer.sh || die
-   fi
-}
-
-pkg_postinst() {
-   if use scanner ; then
-   ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
-   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
-   ewarn "please comment out it."
-
-   ewarn "You should restart cupsd service after installed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}
-
-pkg_postrm() {
-   if use scanner ; then
-   ewarn "You should restart cupsd service after removed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: 600590e391aa6e499d9cab1024c25f3e898d7fc7
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:56:50 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=600590e3

net-print/hpuld: fixed unquoted variable WORKDIR

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
index e94749ba6..cb710bc06 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -44,8 +44,8 @@ QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
 src_unpack() {
default
 
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
+   for f in "${WORKDIR}"/*/*.tar.gz; do
+   tar -zxf "$f" -C "${WORKDIR}" || die
done
 }
 



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-06-24 Thread Rui Huang
commit: 1bee2aa4d91e033cc1d575822dbca7fe79bad3f2
Author: Huang Rui  gmail  com>
AuthorDate: Fri Jun 24 11:37:31 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Jun 24 11:38:02 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bee2aa4

net-print/hpuld: fix install error when have rpm

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 37 ++-
 net-print/hpuld/metadata.xml  |  2 +-
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index ead2296e6..1d31577a8 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -4,6 +4,7 @@
 EAPI="8"
 
 MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
@@ -63,6 +64,9 @@ src_install() {
sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
 
# Fix scanner install path
sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
@@ -76,25 +80,13 @@ src_install() {
mkdir -p "${D}"/etc/hotplug/usb || die
 
if use scanner ; then
-   local SCDIR="/etc/sane.d"
-
-   if [ -f ${SCDIR}/dll.conf ] ; then
-   mkdir -p ${D}/${SCDIR} || die
-   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
-   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
-   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
-   # Comment out geniusvp2 backend
-   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
-   fi
-   else
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   chmod 664 ${D}/${SCDIR}/dll.conf
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
 
sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
else
sh ./install-printer.sh || die
fi
@@ -103,8 +95,8 @@ src_install() {
 pkg_postinst() {
if use scanner ; then
ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in /etc/sane.d/dll.conf."
-   ewarn "If the geniusvp2 is listed in /etc/sane.d/dll.conf,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
ewarn "please comment out it."
 
ewarn "You should restart cupsd service after installed $P."
@@ -115,9 +107,8 @@ pkg_postinst() {
 
 pkg_postrm() {
if use scanner ; then
-   ewarn "After you removed $P,"
-   ewarn "if the smfp is listed in /etc/sane.d/dll.conf"
-   ewarn "you should remove it to keep clean."
-   ewarn "If you are just reinstalling, ignore this message."
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
fi
 }

diff --git a/net-print/hpuld/metadata.xml b/net-print/hpuld/metadata.xml
index 1871ee15e..d32bbab0a 100644
--- a/net-print/hpuld/metadata.xml
+++ b/net-print/hpuld/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd";>
+https://www.gentoo.org/dtd/metadata.dtd";>
 

vows...@gmail.com



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: ef42f139295b22211acd0d2d3e357c17f0228f1a
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:16:24 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:16:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef42f139

net-print/hpuld: new package, add 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/Manifest  |   1 +
 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 123 ++
 net-print/hpuld/metadata.xml  |  32 +++
 3 files changed, 156 insertions(+)

diff --git a/net-print/hpuld/Manifest b/net-print/hpuld/Manifest
new file mode 100644
index 0..cc3e4d734
--- /dev/null
+++ b/net-print/hpuld/Manifest
@@ -0,0 +1 @@
+DIST ULDLINUX_HewlettPackard_V1.00.39.15_00.23.zip 10106994 BLAKE2B 
e187b967a0da80714a67ae188e50b6fb2aab82bb075172f6c7f15a7f595e927ac0537b997ecd141b481e3d90fe9cbe6717b176b4bfc56491b03025c0102c729b
 SHA512 
9dc3f137fbf32d77f2e158c135853c5bd283970bda6fa9d6d548d817418c43559b80b88e82fef9bd91c50a06d8d342ccd4fe14524ab550ee5ab70b955dda92ba

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
new file mode 100644
index 0..384a29926
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PY="$(ver_rs 4 _)"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+QA_FLAGS_IGNORED="
+   /opt/smfp-common/scanner/lib/libsane-smfp.*
+   /opt/smfp-common/printer/bin/pstosecps
+   /opt/smfp-common/printer/bin/rastertospl
+   /opt/smfp-common/printer/bin/smfpnetdiscovery
+"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   local SCDIR="/etc/sane.d"
+
+   if [ -f ${SCDIR}/dll.conf ] ; then
+   mkdir -p ${D}/${SCDIR} || die
+   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
+   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
+   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
+   fi
+   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
+   # Comment out geniusvp2 backend
+   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
+   fi
+   else
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || di

[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: fd270c851e7c7076f0f5f4b8de82b8ba8ac10133
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:19:52 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:19:52 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd270c85

net-print/hpuld: fix typo MY_PV

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index 384a29926..ead2296e6 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="8"
 
-MY_PY="$(ver_rs 4 _)"
+MY_PV="$(ver_rs 4 _)"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
 
 SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
 "
 
 S="${WORKDIR}/uld"



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-06-24 Thread Rui Huang
commit: 1bee2aa4d91e033cc1d575822dbca7fe79bad3f2
Author: Huang Rui  gmail  com>
AuthorDate: Fri Jun 24 11:37:31 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Jun 24 11:38:02 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bee2aa4

net-print/hpuld: fix install error when have rpm

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 37 ++-
 net-print/hpuld/metadata.xml  |  2 +-
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index ead2296e6..1d31577a8 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -4,6 +4,7 @@
 EAPI="8"
 
 MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
@@ -63,6 +64,9 @@ src_install() {
sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
 
# Fix scanner install path
sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
@@ -76,25 +80,13 @@ src_install() {
mkdir -p "${D}"/etc/hotplug/usb || die
 
if use scanner ; then
-   local SCDIR="/etc/sane.d"
-
-   if [ -f ${SCDIR}/dll.conf ] ; then
-   mkdir -p ${D}/${SCDIR} || die
-   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
-   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
-   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
-   # Comment out geniusvp2 backend
-   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
-   fi
-   else
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   chmod 664 ${D}/${SCDIR}/dll.conf
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
 
sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
else
sh ./install-printer.sh || die
fi
@@ -103,8 +95,8 @@ src_install() {
 pkg_postinst() {
if use scanner ; then
ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in /etc/sane.d/dll.conf."
-   ewarn "If the geniusvp2 is listed in /etc/sane.d/dll.conf,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
ewarn "please comment out it."
 
ewarn "You should restart cupsd service after installed $P."
@@ -115,9 +107,8 @@ pkg_postinst() {
 
 pkg_postrm() {
if use scanner ; then
-   ewarn "After you removed $P,"
-   ewarn "if the smfp is listed in /etc/sane.d/dll.conf"
-   ewarn "you should remove it to keep clean."
-   ewarn "If you are just reinstalling, ignore this message."
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
fi
 }

diff --git a/net-print/hpuld/metadata.xml b/net-print/hpuld/metadata.xml
index 1871ee15e..d32bbab0a 100644
--- a/net-print/hpuld/metadata.xml
+++ b/net-print/hpuld/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd";>
+https://www.gentoo.org/dtd/metadata.dtd";>
 

vows...@gmail.com



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: fa253e9766d67697c3aa792425e49f8f7a0d1b28
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:54:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa253e97

net-print/hpuld: fix 860336,860339

Add missing libusb RDEPEND

Closes: https://bugs.gentoo.org/860336
Closes: https://bugs.gentoo.org/860339
Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 111 +++
 1 file changed, 111 insertions(+)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
new file mode 100644
index 0..e94749ba6
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   dev-libs/libusb
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+# Do not complain about CFLAGS etc since it is binary package
+QA_FLAGS_IGNORED=".*"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
+
+   sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
+   else
+   sh ./install-printer.sh || die
+   fi
+}
+
+pkg_postinst() {
+   if use scanner ; then
+   ewarn "If you want to use the scanner,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
+   ewarn "please comment out it."
+
+   ewarn "You should restart cupsd service after installed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}
+
+pkg_postrm() {
+   if use scanner ; then
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: ebc6daae79b138fac98f5dad4423a79d7cc773eb
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:55:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:55:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ebc6daae

net-print/hpuld: drop 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 114 --
 1 file changed, 114 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
deleted file mode 100644
index 1d31577a8..0
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-MY_PV="$(ver_rs 4 _)"
-SANE_CONF_DIR="/etc/sane.d"
-
-DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
-HOMEPAGE="https://support.hp.com";
-
-SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
-"
-
-S="${WORKDIR}/uld"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-
-IUSE="+scanner"
-
-RDEPEND="
-   net-print/cups
-   scanner? (
-   media-gfx/sane-backends
-   )
-"
-
-DEPEND="
-   ${RDEPEND}
-"
-
-BDEPEND="
-   app-arch/unzip
-"
-
-QA_FLAGS_IGNORED="
-   /opt/smfp-common/scanner/lib/libsane-smfp.*
-   /opt/smfp-common/printer/bin/pstosecps
-   /opt/smfp-common/printer/bin/rastertospl
-   /opt/smfp-common/printer/bin/smfpnetdiscovery
-"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-   default
-
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
-   done
-}
-
-src_install() {
-   export AGREE_EULA="y"
-   export CONTINUE_INSTALL="y"
-   export PAGER="$(which cat)"
-
-   # Fix printer install path
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
-   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
-   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
-   # Not use rpm and dpkg
-   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
-   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
-
-   # Fix scanner install path
-   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
-   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
-   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
-   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
-   mkdir -p "${D}"/etc/hotplug/usb || die
-
-   if use scanner ; then
-   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
-   echo "smfp" > "${S}"/"${PN}".conf || die
-   insinto ${SANE_CONF_DIR}/dll.d
-   doins "${S}"/"${PN}".conf
-
-   sh ./install.sh || die
-   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
-   else
-   sh ./install-printer.sh || die
-   fi
-}
-
-pkg_postinst() {
-   if use scanner ; then
-   ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
-   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
-   ewarn "please comment out it."
-
-   ewarn "You should restart cupsd service after installed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}
-
-pkg_postrm() {
-   if use scanner ; then
-   ewarn "You should restart cupsd service after removed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: 600590e391aa6e499d9cab1024c25f3e898d7fc7
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:56:50 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=600590e3

net-print/hpuld: fixed unquoted variable WORKDIR

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
index e94749ba6..cb710bc06 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -44,8 +44,8 @@ QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
 src_unpack() {
default
 
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
+   for f in "${WORKDIR}"/*/*.tar.gz; do
+   tar -zxf "$f" -C "${WORKDIR}" || die
done
 }
 



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-06-24 Thread Rui Huang
commit: 1bee2aa4d91e033cc1d575822dbca7fe79bad3f2
Author: Huang Rui  gmail  com>
AuthorDate: Fri Jun 24 11:37:31 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Jun 24 11:38:02 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bee2aa4

net-print/hpuld: fix install error when have rpm

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 37 ++-
 net-print/hpuld/metadata.xml  |  2 +-
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index ead2296e6..1d31577a8 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -4,6 +4,7 @@
 EAPI="8"
 
 MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
@@ -63,6 +64,9 @@ src_install() {
sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
 
# Fix scanner install path
sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
@@ -76,25 +80,13 @@ src_install() {
mkdir -p "${D}"/etc/hotplug/usb || die
 
if use scanner ; then
-   local SCDIR="/etc/sane.d"
-
-   if [ -f ${SCDIR}/dll.conf ] ; then
-   mkdir -p ${D}/${SCDIR} || die
-   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
-   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
-   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
-   # Comment out geniusvp2 backend
-   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
-   fi
-   else
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   chmod 664 ${D}/${SCDIR}/dll.conf
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
 
sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
else
sh ./install-printer.sh || die
fi
@@ -103,8 +95,8 @@ src_install() {
 pkg_postinst() {
if use scanner ; then
ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in /etc/sane.d/dll.conf."
-   ewarn "If the geniusvp2 is listed in /etc/sane.d/dll.conf,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
ewarn "please comment out it."
 
ewarn "You should restart cupsd service after installed $P."
@@ -115,9 +107,8 @@ pkg_postinst() {
 
 pkg_postrm() {
if use scanner ; then
-   ewarn "After you removed $P,"
-   ewarn "if the smfp is listed in /etc/sane.d/dll.conf"
-   ewarn "you should remove it to keep clean."
-   ewarn "If you are just reinstalling, ignore this message."
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
fi
 }

diff --git a/net-print/hpuld/metadata.xml b/net-print/hpuld/metadata.xml
index 1871ee15e..d32bbab0a 100644
--- a/net-print/hpuld/metadata.xml
+++ b/net-print/hpuld/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd";>
+https://www.gentoo.org/dtd/metadata.dtd";>
 

vows...@gmail.com



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: ef42f139295b22211acd0d2d3e357c17f0228f1a
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:16:24 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:16:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef42f139

net-print/hpuld: new package, add 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/Manifest  |   1 +
 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 123 ++
 net-print/hpuld/metadata.xml  |  32 +++
 3 files changed, 156 insertions(+)

diff --git a/net-print/hpuld/Manifest b/net-print/hpuld/Manifest
new file mode 100644
index 0..cc3e4d734
--- /dev/null
+++ b/net-print/hpuld/Manifest
@@ -0,0 +1 @@
+DIST ULDLINUX_HewlettPackard_V1.00.39.15_00.23.zip 10106994 BLAKE2B 
e187b967a0da80714a67ae188e50b6fb2aab82bb075172f6c7f15a7f595e927ac0537b997ecd141b481e3d90fe9cbe6717b176b4bfc56491b03025c0102c729b
 SHA512 
9dc3f137fbf32d77f2e158c135853c5bd283970bda6fa9d6d548d817418c43559b80b88e82fef9bd91c50a06d8d342ccd4fe14524ab550ee5ab70b955dda92ba

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
new file mode 100644
index 0..384a29926
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PY="$(ver_rs 4 _)"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+QA_FLAGS_IGNORED="
+   /opt/smfp-common/scanner/lib/libsane-smfp.*
+   /opt/smfp-common/printer/bin/pstosecps
+   /opt/smfp-common/printer/bin/rastertospl
+   /opt/smfp-common/printer/bin/smfpnetdiscovery
+"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   local SCDIR="/etc/sane.d"
+
+   if [ -f ${SCDIR}/dll.conf ] ; then
+   mkdir -p ${D}/${SCDIR} || die
+   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
+   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
+   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
+   fi
+   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
+   # Comment out geniusvp2 backend
+   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
+   fi
+   else
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || di

[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: fd270c851e7c7076f0f5f4b8de82b8ba8ac10133
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:19:52 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:19:52 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd270c85

net-print/hpuld: fix typo MY_PV

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index 384a29926..ead2296e6 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="8"
 
-MY_PY="$(ver_rs 4 _)"
+MY_PV="$(ver_rs 4 _)"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
 
 SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
 "
 
 S="${WORKDIR}/uld"



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: fa253e9766d67697c3aa792425e49f8f7a0d1b28
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:54:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa253e97

net-print/hpuld: fix 860336,860339

Add missing libusb RDEPEND

Closes: https://bugs.gentoo.org/860336
Closes: https://bugs.gentoo.org/860339
Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 111 +++
 1 file changed, 111 insertions(+)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
new file mode 100644
index 0..e94749ba6
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   dev-libs/libusb
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+# Do not complain about CFLAGS etc since it is binary package
+QA_FLAGS_IGNORED=".*"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
+
+   sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
+   else
+   sh ./install-printer.sh || die
+   fi
+}
+
+pkg_postinst() {
+   if use scanner ; then
+   ewarn "If you want to use the scanner,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
+   ewarn "please comment out it."
+
+   ewarn "You should restart cupsd service after installed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}
+
+pkg_postrm() {
+   if use scanner ; then
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: ebc6daae79b138fac98f5dad4423a79d7cc773eb
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:55:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:55:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ebc6daae

net-print/hpuld: drop 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 114 --
 1 file changed, 114 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
deleted file mode 100644
index 1d31577a8..0
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-MY_PV="$(ver_rs 4 _)"
-SANE_CONF_DIR="/etc/sane.d"
-
-DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
-HOMEPAGE="https://support.hp.com";
-
-SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
-"
-
-S="${WORKDIR}/uld"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-
-IUSE="+scanner"
-
-RDEPEND="
-   net-print/cups
-   scanner? (
-   media-gfx/sane-backends
-   )
-"
-
-DEPEND="
-   ${RDEPEND}
-"
-
-BDEPEND="
-   app-arch/unzip
-"
-
-QA_FLAGS_IGNORED="
-   /opt/smfp-common/scanner/lib/libsane-smfp.*
-   /opt/smfp-common/printer/bin/pstosecps
-   /opt/smfp-common/printer/bin/rastertospl
-   /opt/smfp-common/printer/bin/smfpnetdiscovery
-"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-   default
-
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
-   done
-}
-
-src_install() {
-   export AGREE_EULA="y"
-   export CONTINUE_INSTALL="y"
-   export PAGER="$(which cat)"
-
-   # Fix printer install path
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
-   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
-   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
-   # Not use rpm and dpkg
-   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
-   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
-
-   # Fix scanner install path
-   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
-   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
-   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
-   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
-   mkdir -p "${D}"/etc/hotplug/usb || die
-
-   if use scanner ; then
-   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
-   echo "smfp" > "${S}"/"${PN}".conf || die
-   insinto ${SANE_CONF_DIR}/dll.d
-   doins "${S}"/"${PN}".conf
-
-   sh ./install.sh || die
-   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
-   else
-   sh ./install-printer.sh || die
-   fi
-}
-
-pkg_postinst() {
-   if use scanner ; then
-   ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
-   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
-   ewarn "please comment out it."
-
-   ewarn "You should restart cupsd service after installed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}
-
-pkg_postrm() {
-   if use scanner ; then
-   ewarn "You should restart cupsd service after removed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: 600590e391aa6e499d9cab1024c25f3e898d7fc7
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:56:50 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=600590e3

net-print/hpuld: fixed unquoted variable WORKDIR

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
index e94749ba6..cb710bc06 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -44,8 +44,8 @@ QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
 src_unpack() {
default
 
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
+   for f in "${WORKDIR}"/*/*.tar.gz; do
+   tar -zxf "$f" -C "${WORKDIR}" || die
done
 }
 



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: ef42f139295b22211acd0d2d3e357c17f0228f1a
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:16:24 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:16:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef42f139

net-print/hpuld: new package, add 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/Manifest  |   1 +
 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 123 ++
 net-print/hpuld/metadata.xml  |  32 +++
 3 files changed, 156 insertions(+)

diff --git a/net-print/hpuld/Manifest b/net-print/hpuld/Manifest
new file mode 100644
index 0..cc3e4d734
--- /dev/null
+++ b/net-print/hpuld/Manifest
@@ -0,0 +1 @@
+DIST ULDLINUX_HewlettPackard_V1.00.39.15_00.23.zip 10106994 BLAKE2B 
e187b967a0da80714a67ae188e50b6fb2aab82bb075172f6c7f15a7f595e927ac0537b997ecd141b481e3d90fe9cbe6717b176b4bfc56491b03025c0102c729b
 SHA512 
9dc3f137fbf32d77f2e158c135853c5bd283970bda6fa9d6d548d817418c43559b80b88e82fef9bd91c50a06d8d342ccd4fe14524ab550ee5ab70b955dda92ba

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
new file mode 100644
index 0..384a29926
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PY="$(ver_rs 4 _)"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+QA_FLAGS_IGNORED="
+   /opt/smfp-common/scanner/lib/libsane-smfp.*
+   /opt/smfp-common/printer/bin/pstosecps
+   /opt/smfp-common/printer/bin/rastertospl
+   /opt/smfp-common/printer/bin/smfpnetdiscovery
+"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   local SCDIR="/etc/sane.d"
+
+   if [ -f ${SCDIR}/dll.conf ] ; then
+   mkdir -p ${D}/${SCDIR} || die
+   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
+   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
+   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
+   fi
+   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
+   # Comment out geniusvp2 backend
+   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
+   fi
+   else
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || di

[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: fd270c851e7c7076f0f5f4b8de82b8ba8ac10133
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:19:52 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:19:52 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd270c85

net-print/hpuld: fix typo MY_PV

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index 384a29926..ead2296e6 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="8"
 
-MY_PY="$(ver_rs 4 _)"
+MY_PV="$(ver_rs 4 _)"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
 
 SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
 "
 
 S="${WORKDIR}/uld"



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-06-24 Thread Rui Huang
commit: 1bee2aa4d91e033cc1d575822dbca7fe79bad3f2
Author: Huang Rui  gmail  com>
AuthorDate: Fri Jun 24 11:37:31 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Jun 24 11:38:02 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bee2aa4

net-print/hpuld: fix install error when have rpm

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 37 ++-
 net-print/hpuld/metadata.xml  |  2 +-
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index ead2296e6..1d31577a8 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -4,6 +4,7 @@
 EAPI="8"
 
 MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
@@ -63,6 +64,9 @@ src_install() {
sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
 
# Fix scanner install path
sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
@@ -76,25 +80,13 @@ src_install() {
mkdir -p "${D}"/etc/hotplug/usb || die
 
if use scanner ; then
-   local SCDIR="/etc/sane.d"
-
-   if [ -f ${SCDIR}/dll.conf ] ; then
-   mkdir -p ${D}/${SCDIR} || die
-   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
-   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
-   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
-   # Comment out geniusvp2 backend
-   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
-   fi
-   else
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   chmod 664 ${D}/${SCDIR}/dll.conf
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
 
sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
else
sh ./install-printer.sh || die
fi
@@ -103,8 +95,8 @@ src_install() {
 pkg_postinst() {
if use scanner ; then
ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in /etc/sane.d/dll.conf."
-   ewarn "If the geniusvp2 is listed in /etc/sane.d/dll.conf,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
ewarn "please comment out it."
 
ewarn "You should restart cupsd service after installed $P."
@@ -115,9 +107,8 @@ pkg_postinst() {
 
 pkg_postrm() {
if use scanner ; then
-   ewarn "After you removed $P,"
-   ewarn "if the smfp is listed in /etc/sane.d/dll.conf"
-   ewarn "you should remove it to keep clean."
-   ewarn "If you are just reinstalling, ignore this message."
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
fi
 }

diff --git a/net-print/hpuld/metadata.xml b/net-print/hpuld/metadata.xml
index 1871ee15e..d32bbab0a 100644
--- a/net-print/hpuld/metadata.xml
+++ b/net-print/hpuld/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd";>
+https://www.gentoo.org/dtd/metadata.dtd";>
 

vows...@gmail.com



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: fa253e9766d67697c3aa792425e49f8f7a0d1b28
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:54:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa253e97

net-print/hpuld: fix 860336,860339

Add missing libusb RDEPEND

Closes: https://bugs.gentoo.org/860336
Closes: https://bugs.gentoo.org/860339
Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 111 +++
 1 file changed, 111 insertions(+)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
new file mode 100644
index 0..e94749ba6
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   dev-libs/libusb
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+# Do not complain about CFLAGS etc since it is binary package
+QA_FLAGS_IGNORED=".*"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
+
+   sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
+   else
+   sh ./install-printer.sh || die
+   fi
+}
+
+pkg_postinst() {
+   if use scanner ; then
+   ewarn "If you want to use the scanner,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
+   ewarn "please comment out it."
+
+   ewarn "You should restart cupsd service after installed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}
+
+pkg_postrm() {
+   if use scanner ; then
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: ebc6daae79b138fac98f5dad4423a79d7cc773eb
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:55:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:55:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ebc6daae

net-print/hpuld: drop 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 114 --
 1 file changed, 114 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
deleted file mode 100644
index 1d31577a8..0
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-MY_PV="$(ver_rs 4 _)"
-SANE_CONF_DIR="/etc/sane.d"
-
-DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
-HOMEPAGE="https://support.hp.com";
-
-SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
-"
-
-S="${WORKDIR}/uld"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-
-IUSE="+scanner"
-
-RDEPEND="
-   net-print/cups
-   scanner? (
-   media-gfx/sane-backends
-   )
-"
-
-DEPEND="
-   ${RDEPEND}
-"
-
-BDEPEND="
-   app-arch/unzip
-"
-
-QA_FLAGS_IGNORED="
-   /opt/smfp-common/scanner/lib/libsane-smfp.*
-   /opt/smfp-common/printer/bin/pstosecps
-   /opt/smfp-common/printer/bin/rastertospl
-   /opt/smfp-common/printer/bin/smfpnetdiscovery
-"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-   default
-
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
-   done
-}
-
-src_install() {
-   export AGREE_EULA="y"
-   export CONTINUE_INSTALL="y"
-   export PAGER="$(which cat)"
-
-   # Fix printer install path
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
-   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
-   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
-   # Not use rpm and dpkg
-   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
-   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
-
-   # Fix scanner install path
-   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
-   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
-   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
-   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
-   mkdir -p "${D}"/etc/hotplug/usb || die
-
-   if use scanner ; then
-   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
-   echo "smfp" > "${S}"/"${PN}".conf || die
-   insinto ${SANE_CONF_DIR}/dll.d
-   doins "${S}"/"${PN}".conf
-
-   sh ./install.sh || die
-   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
-   else
-   sh ./install-printer.sh || die
-   fi
-}
-
-pkg_postinst() {
-   if use scanner ; then
-   ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
-   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
-   ewarn "please comment out it."
-
-   ewarn "You should restart cupsd service after installed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}
-
-pkg_postrm() {
-   if use scanner ; then
-   ewarn "You should restart cupsd service after removed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: 600590e391aa6e499d9cab1024c25f3e898d7fc7
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:56:50 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=600590e3

net-print/hpuld: fixed unquoted variable WORKDIR

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
index e94749ba6..cb710bc06 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -44,8 +44,8 @@ QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
 src_unpack() {
default
 
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
+   for f in "${WORKDIR}"/*/*.tar.gz; do
+   tar -zxf "$f" -C "${WORKDIR}" || die
done
 }
 



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: ef42f139295b22211acd0d2d3e357c17f0228f1a
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:16:24 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:16:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef42f139

net-print/hpuld: new package, add 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/Manifest  |   1 +
 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 123 ++
 net-print/hpuld/metadata.xml  |  32 +++
 3 files changed, 156 insertions(+)

diff --git a/net-print/hpuld/Manifest b/net-print/hpuld/Manifest
new file mode 100644
index 0..cc3e4d734
--- /dev/null
+++ b/net-print/hpuld/Manifest
@@ -0,0 +1 @@
+DIST ULDLINUX_HewlettPackard_V1.00.39.15_00.23.zip 10106994 BLAKE2B 
e187b967a0da80714a67ae188e50b6fb2aab82bb075172f6c7f15a7f595e927ac0537b997ecd141b481e3d90fe9cbe6717b176b4bfc56491b03025c0102c729b
 SHA512 
9dc3f137fbf32d77f2e158c135853c5bd283970bda6fa9d6d548d817418c43559b80b88e82fef9bd91c50a06d8d342ccd4fe14524ab550ee5ab70b955dda92ba

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
new file mode 100644
index 0..384a29926
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PY="$(ver_rs 4 _)"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+QA_FLAGS_IGNORED="
+   /opt/smfp-common/scanner/lib/libsane-smfp.*
+   /opt/smfp-common/printer/bin/pstosecps
+   /opt/smfp-common/printer/bin/rastertospl
+   /opt/smfp-common/printer/bin/smfpnetdiscovery
+"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   local SCDIR="/etc/sane.d"
+
+   if [ -f ${SCDIR}/dll.conf ] ; then
+   mkdir -p ${D}/${SCDIR} || die
+   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
+   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
+   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
+   fi
+   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
+   # Comment out geniusvp2 backend
+   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
+   fi
+   else
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || di

[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: fd270c851e7c7076f0f5f4b8de82b8ba8ac10133
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:19:52 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:19:52 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd270c85

net-print/hpuld: fix typo MY_PV

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index 384a29926..ead2296e6 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="8"
 
-MY_PY="$(ver_rs 4 _)"
+MY_PV="$(ver_rs 4 _)"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
 
 SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
 "
 
 S="${WORKDIR}/uld"



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: fa253e9766d67697c3aa792425e49f8f7a0d1b28
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:54:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa253e97

net-print/hpuld: fix 860336,860339

Add missing libusb RDEPEND

Closes: https://bugs.gentoo.org/860336
Closes: https://bugs.gentoo.org/860339
Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 111 +++
 1 file changed, 111 insertions(+)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
new file mode 100644
index 0..e94749ba6
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   dev-libs/libusb
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+# Do not complain about CFLAGS etc since it is binary package
+QA_FLAGS_IGNORED=".*"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
+
+   sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
+   else
+   sh ./install-printer.sh || die
+   fi
+}
+
+pkg_postinst() {
+   if use scanner ; then
+   ewarn "If you want to use the scanner,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
+   ewarn "please comment out it."
+
+   ewarn "You should restart cupsd service after installed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}
+
+pkg_postrm() {
+   if use scanner ; then
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: ebc6daae79b138fac98f5dad4423a79d7cc773eb
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:55:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:55:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ebc6daae

net-print/hpuld: drop 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 114 --
 1 file changed, 114 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
deleted file mode 100644
index 1d31577a8..0
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-MY_PV="$(ver_rs 4 _)"
-SANE_CONF_DIR="/etc/sane.d"
-
-DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
-HOMEPAGE="https://support.hp.com";
-
-SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
-"
-
-S="${WORKDIR}/uld"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-
-IUSE="+scanner"
-
-RDEPEND="
-   net-print/cups
-   scanner? (
-   media-gfx/sane-backends
-   )
-"
-
-DEPEND="
-   ${RDEPEND}
-"
-
-BDEPEND="
-   app-arch/unzip
-"
-
-QA_FLAGS_IGNORED="
-   /opt/smfp-common/scanner/lib/libsane-smfp.*
-   /opt/smfp-common/printer/bin/pstosecps
-   /opt/smfp-common/printer/bin/rastertospl
-   /opt/smfp-common/printer/bin/smfpnetdiscovery
-"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-   default
-
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
-   done
-}
-
-src_install() {
-   export AGREE_EULA="y"
-   export CONTINUE_INSTALL="y"
-   export PAGER="$(which cat)"
-
-   # Fix printer install path
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
-   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
-   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
-   # Not use rpm and dpkg
-   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
-   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
-
-   # Fix scanner install path
-   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
-   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
-   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
-   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
-   mkdir -p "${D}"/etc/hotplug/usb || die
-
-   if use scanner ; then
-   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
-   echo "smfp" > "${S}"/"${PN}".conf || die
-   insinto ${SANE_CONF_DIR}/dll.d
-   doins "${S}"/"${PN}".conf
-
-   sh ./install.sh || die
-   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
-   else
-   sh ./install-printer.sh || die
-   fi
-}
-
-pkg_postinst() {
-   if use scanner ; then
-   ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
-   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
-   ewarn "please comment out it."
-
-   ewarn "You should restart cupsd service after installed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}
-
-pkg_postrm() {
-   if use scanner ; then
-   ewarn "You should restart cupsd service after removed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: 600590e391aa6e499d9cab1024c25f3e898d7fc7
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:56:50 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=600590e3

net-print/hpuld: fixed unquoted variable WORKDIR

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
index e94749ba6..cb710bc06 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -44,8 +44,8 @@ QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
 src_unpack() {
default
 
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
+   for f in "${WORKDIR}"/*/*.tar.gz; do
+   tar -zxf "$f" -C "${WORKDIR}" || die
done
 }
 



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-06-24 Thread Rui Huang
commit: 1bee2aa4d91e033cc1d575822dbca7fe79bad3f2
Author: Huang Rui  gmail  com>
AuthorDate: Fri Jun 24 11:37:31 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Jun 24 11:38:02 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bee2aa4

net-print/hpuld: fix install error when have rpm

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 37 ++-
 net-print/hpuld/metadata.xml  |  2 +-
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index ead2296e6..1d31577a8 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -4,6 +4,7 @@
 EAPI="8"
 
 MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
@@ -63,6 +64,9 @@ src_install() {
sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
 
# Fix scanner install path
sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
@@ -76,25 +80,13 @@ src_install() {
mkdir -p "${D}"/etc/hotplug/usb || die
 
if use scanner ; then
-   local SCDIR="/etc/sane.d"
-
-   if [ -f ${SCDIR}/dll.conf ] ; then
-   mkdir -p ${D}/${SCDIR} || die
-   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
-   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
-   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
-   # Comment out geniusvp2 backend
-   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
-   fi
-   else
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   chmod 664 ${D}/${SCDIR}/dll.conf
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
 
sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
else
sh ./install-printer.sh || die
fi
@@ -103,8 +95,8 @@ src_install() {
 pkg_postinst() {
if use scanner ; then
ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in /etc/sane.d/dll.conf."
-   ewarn "If the geniusvp2 is listed in /etc/sane.d/dll.conf,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
ewarn "please comment out it."
 
ewarn "You should restart cupsd service after installed $P."
@@ -115,9 +107,8 @@ pkg_postinst() {
 
 pkg_postrm() {
if use scanner ; then
-   ewarn "After you removed $P,"
-   ewarn "if the smfp is listed in /etc/sane.d/dll.conf"
-   ewarn "you should remove it to keep clean."
-   ewarn "If you are just reinstalling, ignore this message."
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
fi
 }

diff --git a/net-print/hpuld/metadata.xml b/net-print/hpuld/metadata.xml
index 1871ee15e..d32bbab0a 100644
--- a/net-print/hpuld/metadata.xml
+++ b/net-print/hpuld/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd";>
+https://www.gentoo.org/dtd/metadata.dtd";>
 

vows...@gmail.com



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: ef42f139295b22211acd0d2d3e357c17f0228f1a
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:16:24 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:16:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef42f139

net-print/hpuld: new package, add 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/Manifest  |   1 +
 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 123 ++
 net-print/hpuld/metadata.xml  |  32 +++
 3 files changed, 156 insertions(+)

diff --git a/net-print/hpuld/Manifest b/net-print/hpuld/Manifest
new file mode 100644
index 0..cc3e4d734
--- /dev/null
+++ b/net-print/hpuld/Manifest
@@ -0,0 +1 @@
+DIST ULDLINUX_HewlettPackard_V1.00.39.15_00.23.zip 10106994 BLAKE2B 
e187b967a0da80714a67ae188e50b6fb2aab82bb075172f6c7f15a7f595e927ac0537b997ecd141b481e3d90fe9cbe6717b176b4bfc56491b03025c0102c729b
 SHA512 
9dc3f137fbf32d77f2e158c135853c5bd283970bda6fa9d6d548d817418c43559b80b88e82fef9bd91c50a06d8d342ccd4fe14524ab550ee5ab70b955dda92ba

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
new file mode 100644
index 0..384a29926
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PY="$(ver_rs 4 _)"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+QA_FLAGS_IGNORED="
+   /opt/smfp-common/scanner/lib/libsane-smfp.*
+   /opt/smfp-common/printer/bin/pstosecps
+   /opt/smfp-common/printer/bin/rastertospl
+   /opt/smfp-common/printer/bin/smfpnetdiscovery
+"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   local SCDIR="/etc/sane.d"
+
+   if [ -f ${SCDIR}/dll.conf ] ; then
+   mkdir -p ${D}/${SCDIR} || die
+   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
+   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
+   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
+   fi
+   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
+   # Comment out geniusvp2 backend
+   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
+   fi
+   else
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || di

[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: fd270c851e7c7076f0f5f4b8de82b8ba8ac10133
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:19:52 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:19:52 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd270c85

net-print/hpuld: fix typo MY_PV

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index 384a29926..ead2296e6 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="8"
 
-MY_PY="$(ver_rs 4 _)"
+MY_PV="$(ver_rs 4 _)"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
 
 SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
 "
 
 S="${WORKDIR}/uld"



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: fa253e9766d67697c3aa792425e49f8f7a0d1b28
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:54:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa253e97

net-print/hpuld: fix 860336,860339

Add missing libusb RDEPEND

Closes: https://bugs.gentoo.org/860336
Closes: https://bugs.gentoo.org/860339
Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 111 +++
 1 file changed, 111 insertions(+)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
new file mode 100644
index 0..e94749ba6
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   dev-libs/libusb
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+# Do not complain about CFLAGS etc since it is binary package
+QA_FLAGS_IGNORED=".*"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
+
+   sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
+   else
+   sh ./install-printer.sh || die
+   fi
+}
+
+pkg_postinst() {
+   if use scanner ; then
+   ewarn "If you want to use the scanner,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
+   ewarn "please comment out it."
+
+   ewarn "You should restart cupsd service after installed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}
+
+pkg_postrm() {
+   if use scanner ; then
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: ebc6daae79b138fac98f5dad4423a79d7cc773eb
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:55:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:55:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ebc6daae

net-print/hpuld: drop 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 114 --
 1 file changed, 114 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
deleted file mode 100644
index 1d31577a8..0
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-MY_PV="$(ver_rs 4 _)"
-SANE_CONF_DIR="/etc/sane.d"
-
-DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
-HOMEPAGE="https://support.hp.com";
-
-SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
-"
-
-S="${WORKDIR}/uld"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-
-IUSE="+scanner"
-
-RDEPEND="
-   net-print/cups
-   scanner? (
-   media-gfx/sane-backends
-   )
-"
-
-DEPEND="
-   ${RDEPEND}
-"
-
-BDEPEND="
-   app-arch/unzip
-"
-
-QA_FLAGS_IGNORED="
-   /opt/smfp-common/scanner/lib/libsane-smfp.*
-   /opt/smfp-common/printer/bin/pstosecps
-   /opt/smfp-common/printer/bin/rastertospl
-   /opt/smfp-common/printer/bin/smfpnetdiscovery
-"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-   default
-
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
-   done
-}
-
-src_install() {
-   export AGREE_EULA="y"
-   export CONTINUE_INSTALL="y"
-   export PAGER="$(which cat)"
-
-   # Fix printer install path
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
-   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
-   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
-   # Not use rpm and dpkg
-   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
-   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
-
-   # Fix scanner install path
-   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
-   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
-   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
-   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
-   mkdir -p "${D}"/etc/hotplug/usb || die
-
-   if use scanner ; then
-   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
-   echo "smfp" > "${S}"/"${PN}".conf || die
-   insinto ${SANE_CONF_DIR}/dll.d
-   doins "${S}"/"${PN}".conf
-
-   sh ./install.sh || die
-   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
-   else
-   sh ./install-printer.sh || die
-   fi
-}
-
-pkg_postinst() {
-   if use scanner ; then
-   ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
-   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
-   ewarn "please comment out it."
-
-   ewarn "You should restart cupsd service after installed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}
-
-pkg_postrm() {
-   if use scanner ; then
-   ewarn "You should restart cupsd service after removed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: 600590e391aa6e499d9cab1024c25f3e898d7fc7
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:56:50 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=600590e3

net-print/hpuld: fixed unquoted variable WORKDIR

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
index e94749ba6..cb710bc06 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -44,8 +44,8 @@ QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
 src_unpack() {
default
 
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
+   for f in "${WORKDIR}"/*/*.tar.gz; do
+   tar -zxf "$f" -C "${WORKDIR}" || die
done
 }
 



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-06-24 Thread Rui Huang
commit: 1bee2aa4d91e033cc1d575822dbca7fe79bad3f2
Author: Huang Rui  gmail  com>
AuthorDate: Fri Jun 24 11:37:31 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Jun 24 11:38:02 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bee2aa4

net-print/hpuld: fix install error when have rpm

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 37 ++-
 net-print/hpuld/metadata.xml  |  2 +-
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index ead2296e6..1d31577a8 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -4,6 +4,7 @@
 EAPI="8"
 
 MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
@@ -63,6 +64,9 @@ src_install() {
sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
 
# Fix scanner install path
sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
@@ -76,25 +80,13 @@ src_install() {
mkdir -p "${D}"/etc/hotplug/usb || die
 
if use scanner ; then
-   local SCDIR="/etc/sane.d"
-
-   if [ -f ${SCDIR}/dll.conf ] ; then
-   mkdir -p ${D}/${SCDIR} || die
-   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
-   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
-   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
-   # Comment out geniusvp2 backend
-   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
-   fi
-   else
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   chmod 664 ${D}/${SCDIR}/dll.conf
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
 
sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
else
sh ./install-printer.sh || die
fi
@@ -103,8 +95,8 @@ src_install() {
 pkg_postinst() {
if use scanner ; then
ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in /etc/sane.d/dll.conf."
-   ewarn "If the geniusvp2 is listed in /etc/sane.d/dll.conf,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
ewarn "please comment out it."
 
ewarn "You should restart cupsd service after installed $P."
@@ -115,9 +107,8 @@ pkg_postinst() {
 
 pkg_postrm() {
if use scanner ; then
-   ewarn "After you removed $P,"
-   ewarn "if the smfp is listed in /etc/sane.d/dll.conf"
-   ewarn "you should remove it to keep clean."
-   ewarn "If you are just reinstalling, ignore this message."
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
fi
 }

diff --git a/net-print/hpuld/metadata.xml b/net-print/hpuld/metadata.xml
index 1871ee15e..d32bbab0a 100644
--- a/net-print/hpuld/metadata.xml
+++ b/net-print/hpuld/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd";>
+https://www.gentoo.org/dtd/metadata.dtd";>
 

vows...@gmail.com



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: ef42f139295b22211acd0d2d3e357c17f0228f1a
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:16:24 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:16:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef42f139

net-print/hpuld: new package, add 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/Manifest  |   1 +
 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 123 ++
 net-print/hpuld/metadata.xml  |  32 +++
 3 files changed, 156 insertions(+)

diff --git a/net-print/hpuld/Manifest b/net-print/hpuld/Manifest
new file mode 100644
index 0..cc3e4d734
--- /dev/null
+++ b/net-print/hpuld/Manifest
@@ -0,0 +1 @@
+DIST ULDLINUX_HewlettPackard_V1.00.39.15_00.23.zip 10106994 BLAKE2B 
e187b967a0da80714a67ae188e50b6fb2aab82bb075172f6c7f15a7f595e927ac0537b997ecd141b481e3d90fe9cbe6717b176b4bfc56491b03025c0102c729b
 SHA512 
9dc3f137fbf32d77f2e158c135853c5bd283970bda6fa9d6d548d817418c43559b80b88e82fef9bd91c50a06d8d342ccd4fe14524ab550ee5ab70b955dda92ba

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
new file mode 100644
index 0..384a29926
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PY="$(ver_rs 4 _)"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+QA_FLAGS_IGNORED="
+   /opt/smfp-common/scanner/lib/libsane-smfp.*
+   /opt/smfp-common/printer/bin/pstosecps
+   /opt/smfp-common/printer/bin/rastertospl
+   /opt/smfp-common/printer/bin/smfpnetdiscovery
+"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   local SCDIR="/etc/sane.d"
+
+   if [ -f ${SCDIR}/dll.conf ] ; then
+   mkdir -p ${D}/${SCDIR} || die
+   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
+   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
+   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
+   fi
+   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
+   # Comment out geniusvp2 backend
+   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
+   fi
+   else
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || di

[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: fd270c851e7c7076f0f5f4b8de82b8ba8ac10133
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:19:52 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:19:52 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd270c85

net-print/hpuld: fix typo MY_PV

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index 384a29926..ead2296e6 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="8"
 
-MY_PY="$(ver_rs 4 _)"
+MY_PV="$(ver_rs 4 _)"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
 
 SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
 "
 
 S="${WORKDIR}/uld"



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: ef42f139295b22211acd0d2d3e357c17f0228f1a
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:16:24 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:16:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef42f139

net-print/hpuld: new package, add 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/Manifest  |   1 +
 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 123 ++
 net-print/hpuld/metadata.xml  |  32 +++
 3 files changed, 156 insertions(+)

diff --git a/net-print/hpuld/Manifest b/net-print/hpuld/Manifest
new file mode 100644
index 0..cc3e4d734
--- /dev/null
+++ b/net-print/hpuld/Manifest
@@ -0,0 +1 @@
+DIST ULDLINUX_HewlettPackard_V1.00.39.15_00.23.zip 10106994 BLAKE2B 
e187b967a0da80714a67ae188e50b6fb2aab82bb075172f6c7f15a7f595e927ac0537b997ecd141b481e3d90fe9cbe6717b176b4bfc56491b03025c0102c729b
 SHA512 
9dc3f137fbf32d77f2e158c135853c5bd283970bda6fa9d6d548d817418c43559b80b88e82fef9bd91c50a06d8d342ccd4fe14524ab550ee5ab70b955dda92ba

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
new file mode 100644
index 0..384a29926
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PY="$(ver_rs 4 _)"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+QA_FLAGS_IGNORED="
+   /opt/smfp-common/scanner/lib/libsane-smfp.*
+   /opt/smfp-common/printer/bin/pstosecps
+   /opt/smfp-common/printer/bin/rastertospl
+   /opt/smfp-common/printer/bin/smfpnetdiscovery
+"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   local SCDIR="/etc/sane.d"
+
+   if [ -f ${SCDIR}/dll.conf ] ; then
+   mkdir -p ${D}/${SCDIR} || die
+   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
+   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
+   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
+   fi
+   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
+   # Comment out geniusvp2 backend
+   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
+   fi
+   else
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || di

[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: fd270c851e7c7076f0f5f4b8de82b8ba8ac10133
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:19:52 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:19:52 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd270c85

net-print/hpuld: fix typo MY_PV

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index 384a29926..ead2296e6 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="8"
 
-MY_PY="$(ver_rs 4 _)"
+MY_PV="$(ver_rs 4 _)"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
 
 SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
 "
 
 S="${WORKDIR}/uld"



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-06-24 Thread Rui Huang
commit: 1bee2aa4d91e033cc1d575822dbca7fe79bad3f2
Author: Huang Rui  gmail  com>
AuthorDate: Fri Jun 24 11:37:31 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Jun 24 11:38:02 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bee2aa4

net-print/hpuld: fix install error when have rpm

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 37 ++-
 net-print/hpuld/metadata.xml  |  2 +-
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index ead2296e6..1d31577a8 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -4,6 +4,7 @@
 EAPI="8"
 
 MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
@@ -63,6 +64,9 @@ src_install() {
sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
 
# Fix scanner install path
sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
@@ -76,25 +80,13 @@ src_install() {
mkdir -p "${D}"/etc/hotplug/usb || die
 
if use scanner ; then
-   local SCDIR="/etc/sane.d"
-
-   if [ -f ${SCDIR}/dll.conf ] ; then
-   mkdir -p ${D}/${SCDIR} || die
-   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
-   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
-   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
-   # Comment out geniusvp2 backend
-   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
-   fi
-   else
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   chmod 664 ${D}/${SCDIR}/dll.conf
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
 
sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
else
sh ./install-printer.sh || die
fi
@@ -103,8 +95,8 @@ src_install() {
 pkg_postinst() {
if use scanner ; then
ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in /etc/sane.d/dll.conf."
-   ewarn "If the geniusvp2 is listed in /etc/sane.d/dll.conf,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
ewarn "please comment out it."
 
ewarn "You should restart cupsd service after installed $P."
@@ -115,9 +107,8 @@ pkg_postinst() {
 
 pkg_postrm() {
if use scanner ; then
-   ewarn "After you removed $P,"
-   ewarn "if the smfp is listed in /etc/sane.d/dll.conf"
-   ewarn "you should remove it to keep clean."
-   ewarn "If you are just reinstalling, ignore this message."
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
fi
 }

diff --git a/net-print/hpuld/metadata.xml b/net-print/hpuld/metadata.xml
index 1871ee15e..d32bbab0a 100644
--- a/net-print/hpuld/metadata.xml
+++ b/net-print/hpuld/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd";>
+https://www.gentoo.org/dtd/metadata.dtd";>
 

vows...@gmail.com



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: fa253e9766d67697c3aa792425e49f8f7a0d1b28
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:54:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa253e97

net-print/hpuld: fix 860336,860339

Add missing libusb RDEPEND

Closes: https://bugs.gentoo.org/860336
Closes: https://bugs.gentoo.org/860339
Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 111 +++
 1 file changed, 111 insertions(+)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
new file mode 100644
index 0..e94749ba6
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   dev-libs/libusb
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+# Do not complain about CFLAGS etc since it is binary package
+QA_FLAGS_IGNORED=".*"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
+
+   sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
+   else
+   sh ./install-printer.sh || die
+   fi
+}
+
+pkg_postinst() {
+   if use scanner ; then
+   ewarn "If you want to use the scanner,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
+   ewarn "please comment out it."
+
+   ewarn "You should restart cupsd service after installed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}
+
+pkg_postrm() {
+   if use scanner ; then
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: ebc6daae79b138fac98f5dad4423a79d7cc773eb
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:55:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:55:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ebc6daae

net-print/hpuld: drop 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 114 --
 1 file changed, 114 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
deleted file mode 100644
index 1d31577a8..0
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-MY_PV="$(ver_rs 4 _)"
-SANE_CONF_DIR="/etc/sane.d"
-
-DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
-HOMEPAGE="https://support.hp.com";
-
-SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
-"
-
-S="${WORKDIR}/uld"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-
-IUSE="+scanner"
-
-RDEPEND="
-   net-print/cups
-   scanner? (
-   media-gfx/sane-backends
-   )
-"
-
-DEPEND="
-   ${RDEPEND}
-"
-
-BDEPEND="
-   app-arch/unzip
-"
-
-QA_FLAGS_IGNORED="
-   /opt/smfp-common/scanner/lib/libsane-smfp.*
-   /opt/smfp-common/printer/bin/pstosecps
-   /opt/smfp-common/printer/bin/rastertospl
-   /opt/smfp-common/printer/bin/smfpnetdiscovery
-"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-   default
-
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
-   done
-}
-
-src_install() {
-   export AGREE_EULA="y"
-   export CONTINUE_INSTALL="y"
-   export PAGER="$(which cat)"
-
-   # Fix printer install path
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
-   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
-   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
-   # Not use rpm and dpkg
-   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
-   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
-
-   # Fix scanner install path
-   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
-   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
-   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
-   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
-   mkdir -p "${D}"/etc/hotplug/usb || die
-
-   if use scanner ; then
-   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
-   echo "smfp" > "${S}"/"${PN}".conf || die
-   insinto ${SANE_CONF_DIR}/dll.d
-   doins "${S}"/"${PN}".conf
-
-   sh ./install.sh || die
-   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
-   else
-   sh ./install-printer.sh || die
-   fi
-}
-
-pkg_postinst() {
-   if use scanner ; then
-   ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
-   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
-   ewarn "please comment out it."
-
-   ewarn "You should restart cupsd service after installed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}
-
-pkg_postrm() {
-   if use scanner ; then
-   ewarn "You should restart cupsd service after removed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: 600590e391aa6e499d9cab1024c25f3e898d7fc7
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:56:50 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=600590e3

net-print/hpuld: fixed unquoted variable WORKDIR

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
index e94749ba6..cb710bc06 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -44,8 +44,8 @@ QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
 src_unpack() {
default
 
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
+   for f in "${WORKDIR}"/*/*.tar.gz; do
+   tar -zxf "$f" -C "${WORKDIR}" || die
done
 }
 



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: ef42f139295b22211acd0d2d3e357c17f0228f1a
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:16:24 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:16:24 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef42f139

net-print/hpuld: new package, add 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/Manifest  |   1 +
 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 123 ++
 net-print/hpuld/metadata.xml  |  32 +++
 3 files changed, 156 insertions(+)

diff --git a/net-print/hpuld/Manifest b/net-print/hpuld/Manifest
new file mode 100644
index 0..cc3e4d734
--- /dev/null
+++ b/net-print/hpuld/Manifest
@@ -0,0 +1 @@
+DIST ULDLINUX_HewlettPackard_V1.00.39.15_00.23.zip 10106994 BLAKE2B 
e187b967a0da80714a67ae188e50b6fb2aab82bb075172f6c7f15a7f595e927ac0537b997ecd141b481e3d90fe9cbe6717b176b4bfc56491b03025c0102c729b
 SHA512 
9dc3f137fbf32d77f2e158c135853c5bd283970bda6fa9d6d548d817418c43559b80b88e82fef9bd91c50a06d8d342ccd4fe14524ab550ee5ab70b955dda92ba

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
new file mode 100644
index 0..384a29926
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PY="$(ver_rs 4 _)"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+QA_FLAGS_IGNORED="
+   /opt/smfp-common/scanner/lib/libsane-smfp.*
+   /opt/smfp-common/printer/bin/pstosecps
+   /opt/smfp-common/printer/bin/rastertospl
+   /opt/smfp-common/printer/bin/smfpnetdiscovery
+"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   local SCDIR="/etc/sane.d"
+
+   if [ -f ${SCDIR}/dll.conf ] ; then
+   mkdir -p ${D}/${SCDIR} || die
+   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
+   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
+   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
+   fi
+   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
+   # Comment out geniusvp2 backend
+   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
+   fi
+   else
+   echo "smfp" >> ${D}/${SCDIR}/dll.conf || di

[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-04-21 Thread Rui Huang
commit: fd270c851e7c7076f0f5f4b8de82b8ba8ac10133
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 21 12:19:52 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Thu Apr 21 12:19:52 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd270c85

net-print/hpuld: fix typo MY_PV

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index 384a29926..ead2296e6 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="8"
 
-MY_PY="$(ver_rs 4 _)"
+MY_PV="$(ver_rs 4 _)"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
 
 SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PY}.zip
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
 "
 
 S="${WORKDIR}/uld"



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-06-24 Thread Rui Huang
commit: 1bee2aa4d91e033cc1d575822dbca7fe79bad3f2
Author: Huang Rui  gmail  com>
AuthorDate: Fri Jun 24 11:37:31 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Jun 24 11:38:02 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bee2aa4

net-print/hpuld: fix install error when have rpm

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 37 ++-
 net-print/hpuld/metadata.xml  |  2 +-
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
index ead2296e6..1d31577a8 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
@@ -4,6 +4,7 @@
 EAPI="8"
 
 MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com";
@@ -63,6 +64,9 @@ src_install() {
sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
 
# Fix scanner install path
sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
@@ -76,25 +80,13 @@ src_install() {
mkdir -p "${D}"/etc/hotplug/usb || die
 
if use scanner ; then
-   local SCDIR="/etc/sane.d"
-
-   if [ -f ${SCDIR}/dll.conf ] ; then
-   mkdir -p ${D}/${SCDIR} || die
-   cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
-   if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
-   echo "# Add support for the HP-ULD specific 
backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
-   # Comment out geniusvp2 backend
-   sed -i 's/geniusvp2/#geniusvp2/' > 
${D}/${SCDIR}/dll.conf || die
-   fi
-   else
-   echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-   fi
-   chmod 664 ${D}/${SCDIR}/dll.conf
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
 
sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
else
sh ./install-printer.sh || die
fi
@@ -103,8 +95,8 @@ src_install() {
 pkg_postinst() {
if use scanner ; then
ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in /etc/sane.d/dll.conf."
-   ewarn "If the geniusvp2 is listed in /etc/sane.d/dll.conf,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
ewarn "please comment out it."
 
ewarn "You should restart cupsd service after installed $P."
@@ -115,9 +107,8 @@ pkg_postinst() {
 
 pkg_postrm() {
if use scanner ; then
-   ewarn "After you removed $P,"
-   ewarn "if the smfp is listed in /etc/sane.d/dll.conf"
-   ewarn "you should remove it to keep clean."
-   ewarn "If you are just reinstalling, ignore this message."
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
fi
 }

diff --git a/net-print/hpuld/metadata.xml b/net-print/hpuld/metadata.xml
index 1871ee15e..d32bbab0a 100644
--- a/net-print/hpuld/metadata.xml
+++ b/net-print/hpuld/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd";>
+https://www.gentoo.org/dtd/metadata.dtd";>
 

vows...@gmail.com



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: fa253e9766d67697c3aa792425e49f8f7a0d1b28
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:54:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa253e97

net-print/hpuld: fix 860336,860339

Add missing libusb RDEPEND

Closes: https://bugs.gentoo.org/860336
Closes: https://bugs.gentoo.org/860339
Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 111 +++
 1 file changed, 111 insertions(+)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
new file mode 100644
index 0..e94749ba6
--- /dev/null
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
+
+DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
+HOMEPAGE="https://support.hp.com";
+
+SRC_URI="
+   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
+"
+
+S="${WORKDIR}/uld"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+
+IUSE="+scanner"
+
+RDEPEND="
+   dev-libs/libusb
+   net-print/cups
+   scanner? (
+   media-gfx/sane-backends
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+# Do not complain about CFLAGS etc since it is binary package
+QA_FLAGS_IGNORED=".*"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+   default
+
+   for f in ${WORKDIR}/*/*.tar.gz; do
+   tar -zxf "$f" -C ${WORKDIR} || die
+   done
+}
+
+src_install() {
+   export AGREE_EULA="y"
+   export CONTINUE_INSTALL="y"
+   export PAGER="$(which cat)"
+
+   # Fix printer install path
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
+   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
+   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
+   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
+   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
+   # Not use rpm and dpkg
+   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
+   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
+
+   # Fix scanner install path
+   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
+   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
+   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
+   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
+   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
+   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
+   mkdir -p "${D}"/etc/hotplug/usb || die
+
+   if use scanner ; then
+   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
+   echo "smfp" > "${S}"/"${PN}".conf || die
+   insinto ${SANE_CONF_DIR}/dll.d
+   doins "${S}"/"${PN}".conf
+
+   sh ./install.sh || die
+   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
+   else
+   sh ./install-printer.sh || die
+   fi
+}
+
+pkg_postinst() {
+   if use scanner ; then
+   ewarn "If you want to use the scanner,"
+   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
+   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
+   ewarn "please comment out it."
+
+   ewarn "You should restart cupsd service after installed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}
+
+pkg_postrm() {
+   if use scanner ; then
+   ewarn "You should restart cupsd service after removed $P."
+   ewarn "OpenRC: rc-service cupsd restart"
+   ewarn "systemd: systemctl restart cups.service"
+   fi
+}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: ebc6daae79b138fac98f5dad4423a79d7cc773eb
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:55:59 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:55:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ebc6daae

net-print/hpuld: drop 1.00.39.15.00.23

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild | 114 --
 1 file changed, 114 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
deleted file mode 100644
index 1d31577a8..0
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-MY_PV="$(ver_rs 4 _)"
-SANE_CONF_DIR="/etc/sane.d"
-
-DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
-HOMEPAGE="https://support.hp.com";
-
-SRC_URI="
-   
https://ftp.ext.hp.com/pub/softlib/software13/printers/LaserJet/M437_M443/ULDLINUX_HewlettPackard_V${MY_PV}.zip
-"
-
-S="${WORKDIR}/uld"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-
-IUSE="+scanner"
-
-RDEPEND="
-   net-print/cups
-   scanner? (
-   media-gfx/sane-backends
-   )
-"
-
-DEPEND="
-   ${RDEPEND}
-"
-
-BDEPEND="
-   app-arch/unzip
-"
-
-QA_FLAGS_IGNORED="
-   /opt/smfp-common/scanner/lib/libsane-smfp.*
-   /opt/smfp-common/printer/bin/pstosecps
-   /opt/smfp-common/printer/bin/rastertospl
-   /opt/smfp-common/printer/bin/smfpnetdiscovery
-"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-   default
-
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
-   done
-}
-
-src_install() {
-   export AGREE_EULA="y"
-   export CONTINUE_INSTALL="y"
-   export PAGER="$(which cat)"
-
-   # Fix printer install path
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/package_utils || die
-   sed -i "s#\"/opt\"#\"${D}/opt\"#g" noarch/pre_install.sh || die
-   sed -i 
"s#\"\$INSTDIR_CUPS_BACKENDS\"#\"${D}/\$INSTDIR_CUPS_BACKENDS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" 
noarch/printer.pkg || die
-   sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" 
noarch/printer-script.pkg || die
-   sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" 
noarch/printer-script.pkg || die
-   # Not use rpm and dpkg
-   sed -i "s#which rpm#which not_found_command_${PN}#g" 
noarch/package_utils || die
-   sed -i "s#which dpkg#which not_found_command_${PN}#g" 
noarch/package_utils || die
-
-   # Fix scanner install path
-   sed -i 
"s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i "s#/usr/lib/sane#${D}/usr/lib\${LIBSFX}/sane#g" 
noarch/scanner.pkg || die
-   sed -i 
"s#/usr/share/locale/\$i/LC_MESSAGES/#${D}//usr/share/locale/\$i/LC_MESSAGES#g" 
noarch/scanner.pkg || die
-   sed -i "s#\$(sane_config)#${D}/\$(sane_config)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(udev_rules)#${D}/\$(udev_rules)#g" 
noarch/scanner-script.pkg || die
-   sed -i "s#\$(hal_rules)#${D}/\$(hal_rules)#g" noarch/scanner-script.pkg 
|| die
-   sed -i "s#\${USERMAP}#${D}/\${USERMAP}#g" noarch/scanner-script.pkg || 
die
-   sed -i "s#  trigger_libusbscanner_hotplug##g" 
noarch/scanner-script.pkg || die
-   mkdir -p "${D}"/etc/hotplug/usb || die
-
-   if use scanner ; then
-   echo "# Add support for the HP-ULD specific backend.  Needs 
net-print/hpuld installed." > "${S}"/"${PN}".conf || die
-   echo "smfp" > "${S}"/"${PN}".conf || die
-   insinto ${SANE_CONF_DIR}/dll.d
-   doins "${S}"/"${PN}".conf
-
-   sh ./install.sh || die
-   fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
-   else
-   sh ./install-printer.sh || die
-   fi
-}
-
-pkg_postinst() {
-   if use scanner ; then
-   ewarn "If you want to use the scanner,"
-   ewarn "make sure the smfp is listed in 
${SANE_CONF_DIR}/dll.d/"${PN}".conf."
-   ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
-   ewarn "please comment out it."
-
-   ewarn "You should restart cupsd service after installed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}
-
-pkg_postrm() {
-   if use scanner ; then
-   ewarn "You should restart cupsd service after removed $P."
-   ewarn "OpenRC: rc-service cupsd restart"
-   ewarn "systemd: systemctl restart cups.service"
-   fi
-}



[gentoo-commits] repo/proj/guru:dev commit in: net-print/hpuld/

2022-09-06 Thread Rui Huang
commit: 600590e391aa6e499d9cab1024c25f3e898d7fc7
Author: Huang Rui  gmail  com>
AuthorDate: Wed Sep  7 03:56:50 2022 +
Commit: Rui Huang  gmail  com>
CommitDate: Wed Sep  7 03:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=600590e3

net-print/hpuld: fixed unquoted variable WORKDIR

Signed-off-by: Huang Rui  gmail.com>

 net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild 
b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
index e94749ba6..cb710bc06 100644
--- a/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
+++ b/net-print/hpuld/hpuld-1.00.39.15.00.23-r1.ebuild
@@ -44,8 +44,8 @@ QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
 src_unpack() {
default
 
-   for f in ${WORKDIR}/*/*.tar.gz; do
-   tar -zxf "$f" -C ${WORKDIR} || die
+   for f in "${WORKDIR}"/*/*.tar.gz; do
+   tar -zxf "$f" -C "${WORKDIR}" || die
done
 }