| 1 |
commit: 5b541262c9bb81a24834fd39e7df5dffe0c6ba90 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 2 22:39:31 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 2 22:46:50 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b541262 |
| 7 |
|
| 8 |
media-gfx/sane-backends: version bump to 1.0.25 |
| 9 |
|
| 10 |
media-gfx/sane-backends/Manifest | 1 + |
| 11 |
...ane-backends-9999.ebuild => sane-backends-1.0.25.ebuild} | 13 ++++++++----- |
| 12 |
media-gfx/sane-backends/sane-backends-9999.ebuild | 13 ++++++++----- |
| 13 |
3 files changed, 17 insertions(+), 10 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest |
| 16 |
index 8693790..7100061 100644 |
| 17 |
--- a/media-gfx/sane-backends/Manifest |
| 18 |
+++ b/media-gfx/sane-backends/Manifest |
| 19 |
@@ -1,2 +1,3 @@ |
| 20 |
DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c |
| 21 |
+DIST sane-backends-1.0.25.tar.gz 5955016 SHA256 a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c SHA512 b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df WHIRLPOOL 557a3ac8785c0dd7f98aa55d5edaf76fb5b2b3c86a2431bb40b5b132ac05de3abcb250a8bcf8ed188868c4f124ce0a323a92a5a83c7b44a20908fe40ca323711 |
| 22 |
DIST sane-backends-git20150628.tar.gz 5765552 SHA256 4cfd1245df8ade75cbfaedec91b1daaea6d30e0736e5d2f9afcd0a56fc357711 SHA512 8e8160b2337502a0b77724ffaa5bd65a6daaa3fa5587f1b72e2714c9253e8130e96170d7f1de38210e17c5524cbe0953ff0464d29db194354d4e9b7249782eaf WHIRLPOOL d9b9a4f44cb3fcda9c8099d5ed3a9764e0a961f80ae1a89dda4e0ec8e6c24c830ad0feebd13c28af848c133a99e50d21c2f01269e434af31b17164a377edbbff |
| 23 |
|
| 24 |
diff --git a/media-gfx/sane-backends/sane-backends-9999.ebuild b/media-gfx/sane-backends/sane-backends-1.0.25.ebuild |
| 25 |
similarity index 96% |
| 26 |
copy from media-gfx/sane-backends/sane-backends-9999.ebuild |
| 27 |
copy to media-gfx/sane-backends/sane-backends-1.0.25.ebuild |
| 28 |
index 2af175b..9604d38 100644 |
| 29 |
--- a/media-gfx/sane-backends/sane-backends-9999.ebuild |
| 30 |
+++ b/media-gfx/sane-backends/sane-backends-1.0.25.ebuild |
| 31 |
@@ -4,7 +4,7 @@ |
| 32 |
|
| 33 |
EAPI="5" |
| 34 |
|
| 35 |
-inherit autotools eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs |
| 36 |
+inherit eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs |
| 37 |
|
| 38 |
# gphoto and v4l are handled by their usual USE flags. |
| 39 |
# The pint backend was disabled because I could not get it to compile. |
| 40 |
@@ -121,7 +121,7 @@ HOMEPAGE="http://www.sane-project.org/" |
| 41 |
case ${PV} in |
| 42 |
9999) |
| 43 |
EGIT_REPO_URI="git://anonscm.debian.org/sane/sane-backends.git" |
| 44 |
- inherit git-r3 |
| 45 |
+ inherit git-r3 autotools |
| 46 |
;; |
| 47 |
*_pre*) |
| 48 |
MY_P="${PN}-git${PV#*_pre}" |
| 49 |
@@ -131,7 +131,8 @@ case ${PV} in |
| 50 |
;; |
| 51 |
*) |
| 52 |
MY_P=${P} |
| 53 |
- SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz" |
| 54 |
+ FRS_ID="4146" |
| 55 |
+ SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz" |
| 56 |
;; |
| 57 |
esac |
| 58 |
|
| 59 |
@@ -193,8 +194,10 @@ src_prepare() { |
| 60 |
EOF |
| 61 |
epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch |
| 62 |
epatch "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch |
| 63 |
- mv configure.{in,ac} || die |
| 64 |
- AT_NOELIBTOOLIZE=yes eautoreconf |
| 65 |
+ if [[ ${PV} == "9999" ]] ; then |
| 66 |
+ mv configure.{in,ac} || die |
| 67 |
+ AT_NOELIBTOOLIZE=yes eautoreconf |
| 68 |
+ fi |
| 69 |
|
| 70 |
# Fix for "make check". Upstream sometimes forgets to update this. |
| 71 |
local ver=$(./configure --version | awk '{print $NF; exit 0}') |
| 72 |
|
| 73 |
diff --git a/media-gfx/sane-backends/sane-backends-9999.ebuild b/media-gfx/sane-backends/sane-backends-9999.ebuild |
| 74 |
index 2af175b..9604d38 100644 |
| 75 |
--- a/media-gfx/sane-backends/sane-backends-9999.ebuild |
| 76 |
+++ b/media-gfx/sane-backends/sane-backends-9999.ebuild |
| 77 |
@@ -4,7 +4,7 @@ |
| 78 |
|
| 79 |
EAPI="5" |
| 80 |
|
| 81 |
-inherit autotools eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs |
| 82 |
+inherit eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs |
| 83 |
|
| 84 |
# gphoto and v4l are handled by their usual USE flags. |
| 85 |
# The pint backend was disabled because I could not get it to compile. |
| 86 |
@@ -121,7 +121,7 @@ HOMEPAGE="http://www.sane-project.org/" |
| 87 |
case ${PV} in |
| 88 |
9999) |
| 89 |
EGIT_REPO_URI="git://anonscm.debian.org/sane/sane-backends.git" |
| 90 |
- inherit git-r3 |
| 91 |
+ inherit git-r3 autotools |
| 92 |
;; |
| 93 |
*_pre*) |
| 94 |
MY_P="${PN}-git${PV#*_pre}" |
| 95 |
@@ -131,7 +131,8 @@ case ${PV} in |
| 96 |
;; |
| 97 |
*) |
| 98 |
MY_P=${P} |
| 99 |
- SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz" |
| 100 |
+ FRS_ID="4146" |
| 101 |
+ SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz" |
| 102 |
;; |
| 103 |
esac |
| 104 |
|
| 105 |
@@ -193,8 +194,10 @@ src_prepare() { |
| 106 |
EOF |
| 107 |
epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch |
| 108 |
epatch "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch |
| 109 |
- mv configure.{in,ac} || die |
| 110 |
- AT_NOELIBTOOLIZE=yes eautoreconf |
| 111 |
+ if [[ ${PV} == "9999" ]] ; then |
| 112 |
+ mv configure.{in,ac} || die |
| 113 |
+ AT_NOELIBTOOLIZE=yes eautoreconf |
| 114 |
+ fi |
| 115 |
|
| 116 |
# Fix for "make check". Upstream sometimes forgets to update this. |
| 117 |
local ver=$(./configure --version | awk '{print $NF; exit 0}') |
Archives