commit: 782bd20c98a5f42709dfae16ae9e5520ea8af6a6
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 3 01:14:53 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 3 01:19:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782bd20c
app-admin/rsyslog: drop rc version handling
Upstream doesn't release rc versions anymore since version/release
schema switch in 2014.
Package-Manager: Portage-2.3.44, Repoman-2.3.10
app-admin/rsyslog/Manifest | 4 ++--
app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild | 31 ++++--------------------------
app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild | 31 ++++--------------------------
3 files changed, 10 insertions(+), 56 deletions(-)
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index a24a8ca250e..48e4d0a3f28 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,4 +1,4 @@
DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B
e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929
SHA512
3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
DIST rsyslog-8.36.0.tar.gz 2639477 BLAKE2B
9c7343d853f79e2955a8999e2871a2a9b008cb3ef75b94e2381a3a0ff3e49445593d852d7de3819851dc0d4c17a91d966ca2fbfd52e8215ebdbaf6b7ccd68bdf
SHA512
b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50
-DIST rsyslog-docs-8.35.0.tar.gz 7427270 BLAKE2B
5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1
SHA512
f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
-DIST rsyslog-docs-8.36.0.tar.gz 7570338 BLAKE2B
031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb
SHA512
a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
+DIST rsyslog-doc-8.35.0.tar.gz 7427270 BLAKE2B
5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1
SHA512
f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
+DIST rsyslog-doc-8.36.0.tar.gz 7570338 BLAKE2B
031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb
SHA512
a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
diff --git a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
index 55f6815d83a..21c759a1e37 100644
--- a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
@@ -16,34 +16,11 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
- MY_PV=${PV%_rc*}
- MY_FILENAME="${PN}-${PV}.tar.gz"
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
- S="${WORKDIR}/${PN}-${MY_PV}"
-
- # Upstream URL schema:
- # RC:
https://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
- #
https://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
- # Release:
https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
- MY_URL_PREFIX=
- if [[ ${PV} = *_rc* ]]; then
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index}
${PV})
- if [[ ${_tmp_suffix} = *rc* ]]; then
- MY_URL_PREFIX="${_tmp_suffix}/"
- fi
-
- # Cleaning up temporary variables
- unset _tmp_last_index
- unset _tmp_suffix
- else
- KEYWORDS="amd64 arm ~arm64 hppa x86"
- fi
+ KEYWORDS="amd64 arm ~arm64 hppa x86"
SRC_URI="
-
https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz
-> ${MY_FILENAME}
- doc? (
https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz
-> ${MY_FILENAME_DOCS} )
+ https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+ doc? (
https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
"
PATCHES=(
@@ -149,7 +126,7 @@ src_unpack() {
cd "${S}" || die "Cannot change dir into '${S}'"
mkdir docs || die "Failed to create docs directory"
cd docs || die "Failed to change dir into '${S}/docs'"
- unpack ${MY_FILENAME_DOCS}
+ unpack ${PN}-doc-${PV}.tar.gz
fi
fi
}
diff --git a/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
index 7e8144dac25..fe4340fd727 100644
--- a/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
@@ -16,34 +16,11 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
- MY_PV=${PV%_rc*}
- MY_FILENAME="${PN}-${PV}.tar.gz"
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
- S="${WORKDIR}/${PN}-${MY_PV}"
-
- # Upstream URL schema:
- # RC:
https://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
- #
https://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
- # Release:
https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
- MY_URL_PREFIX=
- if [[ ${PV} = *_rc* ]]; then
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index}
${PV})
- if [[ ${_tmp_suffix} = *rc* ]]; then
- MY_URL_PREFIX="${_tmp_suffix}/"
- fi
-
- # Cleaning up temporary variables
- unset _tmp_last_index
- unset _tmp_suffix
- else
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
- fi
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
SRC_URI="
-
https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz
-> ${MY_FILENAME}
- doc? (
https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz
-> ${MY_FILENAME_DOCS} )
+ https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+ doc? (
https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
"
PATCHES=()
@@ -156,7 +133,7 @@ src_unpack() {
cd "${S}" || die "Cannot change dir into '${S}'"
mkdir docs || die "Failed to create docs directory"
cd docs || die "Failed to change dir into '${S}/docs'"
- unpack ${MY_FILENAME_DOCS}
+ unpack ${PN}-doc-${PV}.tar.gz
fi
fi
}
