commit:     562f65561296983a30df454af8ff6e17195fa563
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  5 21:41:15 2024 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  5 21:50:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=562f6556

dev-libs/libmspack: version bump 1.1, remove old. QA

Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>

Closes: https://bugs.gentoo.org/940092

 dev-libs/libmspack/Manifest                        |  2 +-
 .../libmspack/libmspack-0.10.1_alpha-r1.ebuild     |  6 +++---
 ...ack-0.11_alpha.ebuild => libmspack-1.11.ebuild} | 20 +++---------------
 dev-libs/libmspack/libmspack-9999.ebuild           | 24 +++++-----------------
 4 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 8bde9da8b8e8..2a74fd84ee65 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,2 +1,2 @@
 DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 
39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6
 SHA512 
a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
-DIST libmspack-0.11alpha.tar.gz 509478 BLAKE2B 
7e386ab5ae160000bab9e5523f2ebf3907a5cb564fb7cc8945ca15daf5c8ff2563f6680383c52f6de95d1aa992d6616e2f80133740c8329390a8e5c76ba84301
 SHA512 
40c487e5b4e2f63a6cada26d29db51f605e8c29525a1cb088566d02cf2b1cc9dba263f80e2101d7f8e9d69cf7684a15bcaf791fb4891ad013a56afc7256dfa62
+DIST libmspack-1.11.tar.gz 408982 BLAKE2B 
fd0c197cf222effa79366e7a763765c7a7eabf7a71319d0544a525b8062ea0ad64291351b2a285c5f3b6d7059a54fd60f20f75b019040d138ae8204fb426397e
 SHA512 
f53a253375584d815ba9249bf36b5f08906c37d7ac7fc9e44040ec5600380f830b2e6774e4493d6fa8024409ae9cf8afe782da52fc8f670debe3aaa4ae6b7306

diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild 
b/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
index d65d111ee2e9..c18e97198694 100644
--- a/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
+++ b/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,12 +19,12 @@ fi
 DESCRIPTION="A library for Microsoft compression formats"
 HOMEPAGE="https://www.cabextract.org.uk/libmspack/";
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="debug doc"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
        if [[ ${PV} == *9999 ]] ; then
                # Re-create file layout from release tarball

diff --git a/dev-libs/libmspack/libmspack-0.11_alpha.ebuild 
b/dev-libs/libmspack/libmspack-1.11.ebuild
similarity index 67%
rename from dev-libs/libmspack/libmspack-0.11_alpha.ebuild
rename to dev-libs/libmspack/libmspack-1.11.ebuild
index bb3b310af2e6..06410b741832 100644
--- a/dev-libs/libmspack/libmspack-0.11_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-1.11.ebuild
@@ -8,35 +8,21 @@ inherit autotools
 if [[ ${PV} == *9999 ]] ; then
        EGIT_REPO_URI="https://github.com/kyz/libmspack.git";
        inherit git-r3
-       MY_P="${PN}-9999"
 else
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-       MY_PV="${PV/_alpha/alpha}"
-       MY_P="${PN}-${MY_PV}"
-       
SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz";
+       SRC_URI="https://github.com/kyz/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
 fi
 
 DESCRIPTION="A library for Microsoft compression formats"
 HOMEPAGE="https://www.cabextract.org.uk/libmspack/";
 
+S="${WORKDIR}/${P}/${PN}"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="debug doc"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
-       if [[ ${PV} == *9999 ]] ; then
-               # Re-create file layout from release tarball
-               pushd "${WORKDIR}" > /dev/null || die
-
-               cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
-               rm -r "${S}" || die
-               mv "${WORKDIR}"/${PN}-source "${S}" || die
-
-               popd > /dev/null || die
-       fi
-
        default
 
        eautoreconf

diff --git a/dev-libs/libmspack/libmspack-9999.ebuild 
b/dev-libs/libmspack/libmspack-9999.ebuild
index 86307877dbb7..06410b741832 100644
--- a/dev-libs/libmspack/libmspack-9999.ebuild
+++ b/dev-libs/libmspack/libmspack-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,35 +8,21 @@ inherit autotools
 if [[ ${PV} == *9999 ]] ; then
        EGIT_REPO_URI="https://github.com/kyz/libmspack.git";
        inherit git-r3
-       MY_P="${PN}-9999"
 else
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-       MY_PV="${PV/_alpha/alpha}"
-       MY_P="${PN}-${MY_PV}"
-       
SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz";
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+       SRC_URI="https://github.com/kyz/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
 fi
 
 DESCRIPTION="A library for Microsoft compression formats"
 HOMEPAGE="https://www.cabextract.org.uk/libmspack/";
 
+S="${WORKDIR}/${P}/${PN}"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="debug doc"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
-       if [[ ${PV} == *9999 ]] ; then
-               # Re-create file layout from release tarball
-               pushd "${WORKDIR}" > /dev/null || die
-
-               cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
-               rm -r "${S}" || die
-               mv "${WORKDIR}"/${PN}-source "${S}" || die
-
-               popd > /dev/null || die
-       fi
-
        default
 
        eautoreconf

Reply via email to