From c25d90333ec42fd901dd449e06a30bb3d557d51e Mon Sep 17 00:00:00 2001 From: Marcin Deranek Date: Tue, 24 Aug 2021 14:42:05 +0200 Subject: scangearmp2 should build again Closes: https://bugs.gentoo.org/809623 --- media-gfx/scangearmp2/Manifest | 4 +- media-gfx/scangearmp2/metadata.xml | 3 - media-gfx/scangearmp2/scangearmp2-9999.ebuild | 90 ++++++--------------------- 3 files changed, 20 insertions(+), 77 deletions(-) (limited to 'media-gfx') diff --git a/media-gfx/scangearmp2/Manifest b/media-gfx/scangearmp2/Manifest index 1311fff..3c297b2 100644 --- a/media-gfx/scangearmp2/Manifest +++ b/media-gfx/scangearmp2/Manifest @@ -1,3 +1,3 @@ AUX scangearmp2.desktop 252 BLAKE2B 7e2fbf2de587390bcb23c5b5b9cd36f27fa78e6eb3dba3a0128ffe4e8d4e0d607824506d81b0f115e0d2096025d8639c261eb0f7f27388aa39d733700a1f7edb SHA512 71233acc250948f894fad789ce8286486f9dc8ce2c5aca31faf0533a84915076a2a77e769b16c1564dbbd45d79c67eb666aa5101c2844b4d14858e3594ac6e71 -EBUILD scangearmp2-9999.ebuild 2295 BLAKE2B 29f6a21d6b4ca611bb98f3f2399e73a30d3e480472ed8374a87aee048216a864b7a023b4ee1cfa81d7fbbfde70618dccd53ed5e36eb4ecb96783be1f3cebcd9b SHA512 744a1fdec6647aad2db54687dd3bb8e9be169722ae3a5fe8962d2460791313c41eb1910a8aaa47cbe7250191d76a9586339ddc3f8956fd4608630bfc40ba6aec -MISC metadata.xml 335 BLAKE2B 53d02bec64a5b82d0cbb076f0f47c5677777cec705b713a1f423b8e44432682a332b1490a58a1eb4a45f7e22aaee955a69ece12bd565687d5dccc2cc750524a6 SHA512 5e444957a26a5f64c91ae27109ad644e1909d0a099635c3aa43615ef8e1bf15a4b60d23111be6517da3c983c3f6d2d6fe248bf4658787de187c0fa2b7f71ac7c +EBUILD scangearmp2-9999.ebuild 889 BLAKE2B efa8b5a09afd5af56856ba41406975e91002d7882593b255fb445e38c57b17dce56c21c3a5dee06fabbb94639ad18e5e1f145a89c7d73a372efecece2d376718 SHA512 cb9e51ebb8488b5fb3dd0dfed0f21f02ee904b7aa3c63d3f6f5601e2f739631879b41d531c3cb6d344f7aa63a46a92d2e15146038fa19093248072f02c44fef7 +MISC metadata.xml 269 BLAKE2B 80698b880752c9f4ce5d17dacc6bf1c23007d5dec9727f25d57d0f0483d17cdc848879dab0f7ffeab24458de95ab30528446bc28a4bb350f8733b8cc3c5fc07e SHA512 2d8927951e794d3df202232f78943ccad556c83500d7fbe76d7253bbb82a7e5a7e9c4791de88af5d38e2f7884fae3370a1a3d35f29ee5f0811c7a4047ad992f0 diff --git a/media-gfx/scangearmp2/metadata.xml b/media-gfx/scangearmp2/metadata.xml index 93675c6..a3bb4c1 100644 --- a/media-gfx/scangearmp2/metadata.xml +++ b/media-gfx/scangearmp2/metadata.xml @@ -5,7 +5,4 @@ marcin.deranek@slonko.net Marcin Deranek - - Build with SANE backend - diff --git a/media-gfx/scangearmp2/scangearmp2-9999.ebuild b/media-gfx/scangearmp2/scangearmp2-9999.ebuild index 5d6008a..3987e87 100644 --- a/media-gfx/scangearmp2/scangearmp2-9999.ebuild +++ b/media-gfx/scangearmp2/scangearmp2-9999.ebuild @@ -1,97 +1,43 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils flag-o-matic autotools multilib desktop +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake desktop eutils git-r3 udev DESCRIPTION="Canon InkJet Scanner Driver and ScanGear MP for Linux (Pixus/Pixma-Series)." HOMEPAGE="https://support-au.canon.com.au/contents/AU/EN/0100303302.html" -RESTRICT="mirror" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Ordissimo/${PN}.git" - S="${WORKDIR}/${P}" -else - SRC_URI="https://gdlp01.c-wss.com/gds/3/0100009933/01/${PN}-source-${PV}-1.tar.gz" - S="${WORKDIR}/${PN}-source-${PV}-1" -fi - +EGIT_REPO_URI="https://github.com/Ordissimo/${PN}.git" LICENSE="GPL-2" - +RESTRICT="mirror" SLOT="2" KEYWORDS="~amd64 ~x86" -IUSE="+sane usb" +IUSE="" DEPEND=" + dev-util/intltool + media-gfx/sane-backends + sys-devel/gettext + virtual/jpeg virtual/libusb:1 - >=x11-libs/gtk+-2.16.0" - -src_prepare() { - cd ${PN} - eapply_user - eautoreconf -} + x11-libs/gtk+:3 +" src_configure() { - cd ${PN} - - if use x86; then - LDFLAGS="-L$(pwd)/../com/libs_bin32" - elif use amd64 ; then - LDFLAGS="-L$(pwd)/../com/libs_bin64" - else - die "Not supported arch" - fi - econf LDFLAGS="${LDFLAGS}" + cmake_src_configure } src_compile() { - pushd ${PN} - make || die "Couldn't build ${PN}" - popd + emake -C"${BUILD_DIR}" || die "Couldn't build ${PN}" } src_install() { - pushd ${PN} - make DESTDIR="${D}" install || die "Couldn't make install ${PN}" - popd + cd "${BUILD_DIR}" + emake DESTDIR="${D}" install || die "Couldn't install ${PN}" domenu "${FILESDIR}"/${PN}.desktop - - _libdir="/usr/$(get_libdir)" - _udevdir="/lib/udev/rules.d" - - dodir ${_libdir} - if use x86; then - cp -a com/libs_bin32/* "${D}${_libdir}" - else - 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 - 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 "${D}"/etc/sane.d/dll.d - echo canon_pixma > "${D}"/etc/sane.d/dll.d/canon_pixma.conf - fi } pkg_postinst() { - if use usb; then - if [ -x /sbin/udevadm ]; then - einfo "" - einfo "Reloading usb rules..." - /sbin/udevadm control --reload-rules 2> /dev/null - /sbin/udevadm trigger --action=add --subsystem-match=usb 2>/dev/null - else - einfo "" - einfo "Please, reload usb rules manually." - fi - fi + udev_reload } -- cgit v1.2.3