Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsndfile/
Date: Sat, 26 Oct 2019 23:11:48
Message-Id: 1572131491.571be2db1daddd62cad5716ef4c649595129ca81.whissi@gentoo
1 commit: 571be2db1daddd62cad5716ef4c649595129ca81
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 26 23:10:59 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 26 23:11:31 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571be2db
7
8 media-libs/libsndfile: bump to v1.0.29_pre2_p20191024
9
10 Bug: https://bugs.gentoo.org/631674
11 Package-Manager: Portage-2.3.78, Repoman-2.3.17
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 media-libs/libsndfile/Manifest | 1 +
15 ...ild => libsndfile-1.0.29_pre2_p20191024.ebuild} | 30 +++++++++-------------
16 media-libs/libsndfile/libsndfile-9999.ebuild | 1 +
17 3 files changed, 14 insertions(+), 18 deletions(-)
18
19 diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
20 index 161256fc2f8..b425c3f223a 100644
21 --- a/media-libs/libsndfile/Manifest
22 +++ b/media-libs/libsndfile/Manifest
23 @@ -1 +1,2 @@
24 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
25 +DIST libsndfile-1.0.29_pre2_p20191024.tar.gz 720981 BLAKE2B 9f1dcf3d3669b66d8582d50b62ff863facd7125432a84a3e1e3fb0f817554f260f42948b4479371fb0967dcc75bedc6c49afffc6bee3f973a875d72d2e508210 SHA512 e37b385b90cadc97348db03b6c5ae7a8fcee17ded60f54d1508adddb8e2dc604ea44b60a0fe08627e81c0faa83997cdafb0b0ecf8574f901bf5e8a1819a63998
26
27 diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
28 similarity index 64%
29 copy from media-libs/libsndfile/libsndfile-9999.ebuild
30 copy to media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
31 index aa94640fb8f..c4cf210ec2c 100644
32 --- a/media-libs/libsndfile/libsndfile-9999.ebuild
33 +++ b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
34 @@ -5,15 +5,12 @@ EAPI=7
35
36 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
37
38 -if [[ ${PV} == *9999 ]]; then
39 - inherit autotools git-r3
40 - EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
41 -else
42 - SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
43 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
44 -fi
45 -inherit python-any-r1 multilib-minimal
46 +inherit autotools python-any-r1 multilib-minimal
47
48 +MY_COMMIT="97a361afc24202b16489d8c06910277c06b18b53"
49 +
50 +SRC_URI="https://github.com/erikd/libsndfile/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
51 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
52 DESCRIPTION="C library for reading and writing files containing sampled sound"
53 HOMEPAGE="http://www.mega-nerd.com/libsndfile"
54
55 @@ -26,30 +23,27 @@ RDEPEND="
56 >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}]
57 >=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]
58 >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}]
59 + >=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]
60 )
61 alsa? ( media-libs/alsa-lib:= )
62 sqlite? ( >=dev-db/sqlite-3.2 )"
63 DEPEND="${RDEPEND}"
64 BDEPEND="
65 virtual/pkgconfig
66 - test? ( ${PYTHON_DEPS} )"
67 -if [[ ${PV} == *9999 ]]; then
68 - BDEPEND+="
69 - ${PYTHON_DEPS}
70 - sys-devel/autogen
71 + ${PYTHON_DEPS}
72 + sys-devel/autogen
73 "
74 -fi
75 +
76 +S="${WORKDIR}/${PN}-${MY_COMMIT}"
77
78 pkg_setup() {
79 - if use test || [[ ${PV} == *9999 ]]; then
80 - python-any-r1_pkg_setup
81 - fi
82 + python-any-r1_pkg_setup
83 }
84
85 src_prepare() {
86 default
87
88 - [[ ${PV} == *9999 ]] && eautoreconf
89 + eautoreconf
90 }
91
92 multilib_src_configure() {
93
94 diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
95 index aa94640fb8f..d618e166836 100644
96 --- a/media-libs/libsndfile/libsndfile-9999.ebuild
97 +++ b/media-libs/libsndfile/libsndfile-9999.ebuild
98 @@ -26,6 +26,7 @@ RDEPEND="
99 >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}]
100 >=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]
101 >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}]
102 + >=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]
103 )
104 alsa? ( media-libs/alsa-lib:= )
105 sqlite? ( >=dev-db/sqlite-3.2 )"