diff --git a/media-libs/libjpeg8/libjpeg8-3.0.0.ebuild b/media-libs/libjpeg8/libjpeg8-3.0.0.ebuild
index 6112715d1..8c6a3c67b 100644
--- a/media-libs/libjpeg8/libjpeg8-3.0.0.ebuild
+++ b/media-libs/libjpeg8/libjpeg8-3.0.0.ebuild
@@ -19,12 +19,13 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="cpu_flags_arm_neon"
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
BDEPEND="
- amd64? ( ${ASM_DEPEND} )
+ amd64? (
+ || ( dev-lang/nasm dev-lang/yasm )
+ )
"
-S=${WORKDIR}/${MY_P}-${PV}
+S="${WORKDIR}"/${MY_P}-${PV}
MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
@@ -68,5 +69,5 @@ src_configure() {
src_install() {
dolib.so "${WORKDIR}/libjpeg-turbo-${PV}_build/libjpeg.so.8.3.2"
- dosym libjpeg.so.8.3.2 /usr/$(get_libdir)/libjpeg.so.8
+ dosym libjpeg.so.8.3.2 "/usr/$(get_libdir)/libjpeg.so.8"
}
diff --git a/media-libs/libjpeg8/metadata.xml b/media-libs/libjpeg8/metadata.xml
index 02d906910..c243ca68f 100644
--- a/media-libs/libjpeg8/metadata.xml
+++ b/media-libs/libjpeg8/metadata.xml
@@ -1,16 +1,21 @@
-
- codec@gentoo.org
- Gentoo Codec Project
-
-
- Reflect ABI of libturbojpeg.so.
-
-
- libjpeg-turbo/libjpeg-turbo
- libjpeg-turbo
- cpe:/a:libjpeg-turbo:libjpeg-turbo
-
+
+ support@calculate.ru
+ Mir Calculate
+ Calculate Overlay
+
+
+ libjpeg-turbo is a JPEG image codec that uses SIMD instructions to accelerate baseline
+ JPEG compression and decompression.
+
+
+ Reflect ABI of libturbojpeg.so.
+
+
+ libjpeg-turbo/libjpeg-turbo
+ libjpeg-turbo
+ cpe:/a:libjpeg-turbo:libjpeg-turbo
+
diff --git a/net-print/pantum/metadata.xml b/net-print/pantum/metadata.xml
new file mode 100644
index 000000000..d861ab063
--- /dev/null
+++ b/net-print/pantum/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ support@calculate.ru
+ Mir Calculate
+ Calculate Overlay
+
+
+ CUPS and SANE drivers for Pantum series printer and scanner.
+
+
diff --git a/net-print/pantum/pantum-1.1.106-r1.ebuild b/net-print/pantum/pantum-1.1.106-r1.ebuild
index 6f35ff9f4..1290959ac 100644
--- a/net-print/pantum/pantum-1.1.106-r1.ebuild
+++ b/net-print/pantum/pantum-1.1.106-r1.ebuild
@@ -3,23 +3,21 @@
EAPI=8
-DESCRIPTION="CUPS and SANE drivers for Pantum series printer and scanner."
-HOMEPAGE="https://www.pantum.ru/support/download/driver/"
-
inherit udev
-IUSE="scanner"
-
MY_PV=${PV//./_}
+DESCRIPTION="CUPS and SANE drivers for Pantum series printer and scanner."
+HOMEPAGE="https://www.pantum.ru/support/download/driver/"
SRC_URI="https://drivers.pantum.ru/userfiles/files/download/drive/2013/0619/Pantum%20Ubuntu%20Driver%20V${MY_PV}(1).zip"
LICENSE="AS-IS"
SLOT="0"
KEYWORDS="amd64"
+IUSE="scanner"
RESTRICT="bindist mirror strip"
-COMMON_DEPEND="
+DEPEND="
media-libs/libjpeg8
net-print/cups
net-print/cups-filters
@@ -34,11 +32,8 @@ BDEPEND="
app-arch/unzip
virtual/pkgconfig
"
-DEPEND="
- ${COMMON_DEPEND}
-"
RDEPEND="
- ${COMMON_DEPEND}
+ ${DEPEND}
app-text/ghostscript-gpl
"
@@ -63,14 +58,6 @@ src_install() {
doexe usr/lib/cups/filter/*
insinto /usr/share/cups/model
doins -r usr/share/cups/model/Pantum
-
-# if ! use scanner ; then
-# rm -rf "${D}/usr/lib/x86_64-linux-gnu" || die
-# rm -rf "${D}/usr/local" || die
-# fi
-# mv ${D}/usr/lib ${D}/usr/libexec || die
-# mkdir -p "${D}/etc/ld.so.conf.d/" || die
-# echo "/opt/pantum/lib" >> "${D}/etc/ld.so.conf.d/pantum.conf" || die
}
pkg_postrm() {
@@ -78,12 +65,5 @@ pkg_postrm() {
}
pkg_postinst() {
-# mkdir -p /opt/pantum/lib || die
-# ldconfig
udev_reload
}
-
-#pkg_prerm() {
-# rm -rf /etc/ld.so.conf.d/pantum.conf
-# ldconfig
-#}