diff options
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch | 23 | ||||
| -rw-r--r-- | media-gfx/sane-backends/sane-backends-1.3.1-r1.ebuild (renamed from media-gfx/sane-backends/sane-backends-1.3.1.ebuild) | 12 |
2 files changed, 4 insertions, 31 deletions
diff --git a/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch b/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch deleted file mode 100644 index 32f22f6c181c..000000000000 --- a/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index ddb52b9..c3046b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16,13 +16,11 @@ AM_SILENT_RULES - dnl ****************************************************************** - dnl Determine SANE version components and release status - dnl ****************************************************************** --AS_IF([test x = "x$AWK"],[AC_PROG_AWK]) --AS_IF([test x = "x`echo $VERSION | sed 's/[[.0-9]]//g'`"], -- [is_release=yes], -- [is_release=no]) --V_MAJOR=`echo $VERSION | $AWK -F. '{print $1}'` --V_MINOR=`echo $VERSION | $AWK -F. '{print $2}'` --V_REV=`echo $VERSION | $AWK -F. '{print $3}' | sed 's/^\([[0-9]]*\).*/\1/'`; -+is_release=yes -+is_release=no -+V_MAJOR=1 -+V_MINOR=3 -+V_REV=1 - - AC_DEFINE_UNQUOTED(SANE_DLL_V_MAJOR, $V_MAJOR, [SANE DLL major number]) - AC_DEFINE_UNQUOTED(SANE_DLL_V_MINOR, $V_MINOR, [SANE DLL minor number]) diff --git a/media-gfx/sane-backends/sane-backends-1.3.1.ebuild b/media-gfx/sane-backends/sane-backends-1.3.1-r1.ebuild index 573d4ca4c003..d9c01b788ae2 100644 --- a/media-gfx/sane-backends/sane-backends-1.3.1.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.3.1-r1.ebuild @@ -8,13 +8,10 @@ PYTHON_COMPAT=( python3_{10..13} ) # python-any-r1 required for a script in backends/pixma/scripts/ inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev -MY_PN=backends -MY_P="${MY_PN}-${PV}" DESCRIPTION="Scanner Access Now Easy - Backends" HOMEPAGE="http://www.sane-project.org/" -SRC_URI="https://gitlab.com/sane-project/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2" - -S="${WORKDIR}/${MY_P}" +SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/backends-${PV}.tar.bz2" +S="${WORKDIR}/backends-${PV}" LICENSE="GPL-2 public-domain" SLOT="0" @@ -182,7 +179,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch - "${FILESDIR}/${P}-verfix.patch" ) # ./configure checks to see if these are defined in sys/io.h, @@ -196,6 +192,7 @@ MULTILIB_CHOST_TOOLS=( src_prepare() { default + echo "${PV}" > .tarball-version || die eautoreconf # Needed for udev rules generation/installation @@ -250,8 +247,7 @@ multilib_src_configure() { $(use_with zeroconf avahi) ) - ECONF_SOURCE="${S}" SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ - BACKENDS="${lbackends}" econf "${myconf[@]}" + SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" BACKENDS="${lbackends}" econf "${myconf[@]}" } multilib_src_compile() { |