commit: 571be2db1daddd62cad5716ef4c649595129ca81 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sat Oct 26 23:10:59 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sat Oct 26 23:11:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571be2db
media-libs/libsndfile: bump to v1.0.29_pre2_p20191024 Bug: https://bugs.gentoo.org/631674 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> media-libs/libsndfile/Manifest | 1 + ...ild => libsndfile-1.0.29_pre2_p20191024.ebuild} | 30 +++++++++------------- media-libs/libsndfile/libsndfile-9999.ebuild | 1 + 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest index 161256fc2f8..b425c3f223a 100644 --- a/media-libs/libsndfile/Manifest +++ b/media-libs/libsndfile/Manifest @@ -1 +1,2 @@ DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f +DIST libsndfile-1.0.29_pre2_p20191024.tar.gz 720981 BLAKE2B 9f1dcf3d3669b66d8582d50b62ff863facd7125432a84a3e1e3fb0f817554f260f42948b4479371fb0967dcc75bedc6c49afffc6bee3f973a875d72d2e508210 SHA512 e37b385b90cadc97348db03b6c5ae7a8fcee17ded60f54d1508adddb8e2dc604ea44b60a0fe08627e81c0faa83997cdafb0b0ecf8574f901bf5e8a1819a63998 diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild similarity index 64% copy from media-libs/libsndfile/libsndfile-9999.ebuild copy to media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild index aa94640fb8f..c4cf210ec2c 100644 --- a/media-libs/libsndfile/libsndfile-9999.ebuild +++ b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild @@ -5,15 +5,12 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} ) -if [[ ${PV} == *9999 ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"; -else - SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"; - 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" -fi -inherit python-any-r1 multilib-minimal +inherit autotools python-any-r1 multilib-minimal +MY_COMMIT="97a361afc24202b16489d8c06910277c06b18b53" + +SRC_URI="https://github.com/erikd/libsndfile/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +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" DESCRIPTION="C library for reading and writing files containing sampled sound" HOMEPAGE="http://www.mega-nerd.com/libsndfile"; @@ -26,30 +23,27 @@ RDEPEND=" >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}] >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}] + >=media-libs/opus-1.1:=[${MULTILIB_USEDEP}] ) alsa? ( media-libs/alsa-lib:= ) sqlite? ( >=dev-db/sqlite-3.2 )" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - test? ( ${PYTHON_DEPS} )" -if [[ ${PV} == *9999 ]]; then - BDEPEND+=" - ${PYTHON_DEPS} - sys-devel/autogen + ${PYTHON_DEPS} + sys-devel/autogen " -fi + +S="${WORKDIR}/${PN}-${MY_COMMIT}" pkg_setup() { - if use test || [[ ${PV} == *9999 ]]; then - python-any-r1_pkg_setup - fi + python-any-r1_pkg_setup } src_prepare() { default - [[ ${PV} == *9999 ]] && eautoreconf + eautoreconf } multilib_src_configure() { diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild index aa94640fb8f..d618e166836 100644 --- a/media-libs/libsndfile/libsndfile-9999.ebuild +++ b/media-libs/libsndfile/libsndfile-9999.ebuild @@ -26,6 +26,7 @@ RDEPEND=" >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}] >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}] + >=media-libs/opus-1.1:=[${MULTILIB_USEDEP}] ) alsa? ( media-libs/alsa-lib:= ) sqlite? ( >=dev-db/sqlite-3.2 )"
