diff options
| author | Marcin Deranek <marcin.deranek@slonko.net> | 2020-03-09 13:34:12 +0100 |
|---|---|---|
| committer | Marcin Deranek <marcin.deranek@slonko.net> | 2020-03-09 13:34:12 +0100 |
| commit | 1c42b2c617f2b2932b2a12e3f49cdf0d929f6aea (patch) | |
| tree | 0ac0f4c3beba7f129be210eaee68b173dba14b30 /media-gfx | |
| parent | fb66cc7d1c59596a9cc1a5d3b952e475d48f9a6b (diff) | |
| download | portage-1c42b2c617f2b2932b2a12e3f49cdf0d929f6aea.tar.gz portage-1c42b2c617f2b2932b2a12e3f49cdf0d929f6aea.tar.bz2 portage-1c42b2c617f2b2932b2a12e3f49cdf0d929f6aea.zip | |
Repo fixes and cleanups
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/scangearmp2/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/scangearmp2/scangearmp2-9999.ebuild | 29 |
2 files changed, 16 insertions, 15 deletions
diff --git a/media-gfx/scangearmp2/Manifest b/media-gfx/scangearmp2/Manifest index 68e72aa..d5c224b 100644 --- a/media-gfx/scangearmp2/Manifest +++ b/media-gfx/scangearmp2/Manifest @@ -1,2 +1,2 @@ AUX scangearmp2.desktop 252 BLAKE2B 7e2fbf2de587390bcb23c5b5b9cd36f27fa78e6eb3dba3a0128ffe4e8d4e0d607824506d81b0f115e0d2096025d8639c261eb0f7f27388aa39d733700a1f7edb SHA512 71233acc250948f894fad789ce8286486f9dc8ce2c5aca31faf0533a84915076a2a77e769b16c1564dbbd45d79c67eb666aa5101c2844b4d14858e3594ac6e71 -EBUILD scangearmp2-9999.ebuild 2356 BLAKE2B c728c842d864e281339936729ffedfb764511a9995ab6c9a7c484bc34317c1355a0738dfa561b5500e10e9ce8f0be44ca85a2cd8d55d688549d067af03a377a4 SHA512 8ef9fc53714922c8f78c5c7521af10ee9d01ea038c7e8dc14554ae2a8f285322b1e00d5ba79628a35fea1518666200183aba62344f2656a1630710d7677ca591 +EBUILD scangearmp2-9999.ebuild 2361 BLAKE2B 4cacf2a19209c00db2948151675e60dd68a0c9b217acdcb007653f41c9e4eac3831a1a740e0bfad5a049d6911f39c9c7bb8f9d1d2245df310f5849e985f4fb90 SHA512 4e5035f7ad4043263ff0694ed89b8b4eb861575a488750f96218f8b1ab77ecfcf87282ae7a57c1d5e30f72be6d1f525078e03d0fac4c74b0167a0cdb9750ce84 diff --git a/media-gfx/scangearmp2/scangearmp2-9999.ebuild b/media-gfx/scangearmp2/scangearmp2-9999.ebuild index 68afcee..593a77c 100644 --- a/media-gfx/scangearmp2/scangearmp2-9999.ebuild +++ b/media-gfx/scangearmp2/scangearmp2-9999.ebuild @@ -11,20 +11,21 @@ HOMEPAGE="http://support-au.canon.com.au/contents/AU/EN/0100303302.html" RESTRICT="nomirror confcache" if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Ordissimo/${PN}.git" + inherit git-r3 + EGIT_REPO_URI="https://github.com/Ordissimo/${PN}.git" S="${WORKDIR}/${P}" else - SRC_URI="http://gdlp01.c-wss.com/gds/3/0100009933/01/${PN}-source-${PV}-1.tar.gz" + SRC_URI="http://gdlp01.c-wss.com/gds/3/0100009933/01/${PN}-source-${PV}-1.tar.gz" S="${WORKDIR}/${PN}-source-${PV}-1" fi -LICENSE="UNKNOWN" # GPL-2 source and proprietary binaries +LICENSE="UNKNOWN" # GPL-2 source and proprietary binaries SLOT="2" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~amd64 ~x86" IUSE="+sane usb" -DEPEND=">=dev-libs/libusb-1.0.0 +DEPEND=" + virtual/libusb:1 >=x11-libs/gtk+-2.16.0" src_prepare() { @@ -54,7 +55,7 @@ src_compile() { src_install() { pushd ${PN} - make DESTDIR=${D} install || die "Couldn't make install ${PN}" + make DESTDIR="${D}" install || die "Couldn't make install ${PN}" popd domenu "${FILESDIR}"/${PN}.desktop @@ -63,22 +64,22 @@ src_install() { dodir ${_libdir} if use x86; then - cp -a com/libs_bin32/* ${D}${_libdir} + cp -a com/libs_bin32/* "${D}${_libdir}" else - cp -a com/libs_bin64/* ${D}${_libdir} + cp -a com/libs_bin64/* "${D}${_libdir}" fi # usb if use usb; then - install -D -m 644 scangearmp2/etc/80-canon_mfp2.rules ${D}${_udevdir}/80-canon_mfp2.rules + install -D -m 644 scangearmp2/etc/80-canon_mfp2.rules "${D}${_udevdir}"/80-canon_mfp2.rules fi # sane if use sane; then - install -D -m 755 scangearmp2/src/.libs/libsane-canon_pixma.so.1.0.0 ${D}${_libdir}/sane/libsane-canon_pixma.so.1.0.0 - ln -sf ${_libdir}/sane/libsane-canon_pixma.so.1.0.0 ${D}${_libdir}/sane/libsane-canon_pixma.so.1 - ln -sf ${_libdir}/sane/libsane-canon_pixma.so.1.0.0 ${D}${_libdir}/sane/libsane-canon_pixma.so + install -D -m 755 scangearmp2/src/.libs/libsane-canon_pixma.so.1.0.0 "${D}${_libdir}"/sane/libsane-canon_pixma.so.1.0.0 + ln -sf "${_libdir}"/sane/libsane-canon_pixma.so.1.0.0 "${D}${_libdir}"/sane/libsane-canon_pixma.so.1 + ln -sf "${_libdir}"/sane/libsane-canon_pixma.so.1.0.0 "${D}${_libdir}"/sane/libsane-canon_pixma.so install -d ${D}/etc/sane.d/dll.d - echo canon_pixma > ${D}/etc/sane.d/dll.d/canon_pixma.conf + echo canon_pixma > "${D}"/etc/sane.d/dll.d/canon_pixma.conf fi } |