[gentoo-commits] repo/gentoo:master commit in: media-sound/aacplusenc/

[David Seifert]

commit:     c1b37ccc5c146c2ad38fa7777e9c95786f6441a5
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 21:33:31 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 21:33:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1b37ccc

media-sound/aacplusenc: Change SRC_URI from https to http

Gentoo-Bug: 561160
* EAPI=6

Package-Manager: portage-2.2.27

 media-sound/aacplusenc/Manifest                 |  2 +-
 media-sound/aacplusenc/aacplusenc-0.17.5.ebuild | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/media-sound/aacplusenc/Manifest b/media-sound/aacplusenc/Manifest
index 89b6e9b..35892c4 100644
--- a/media-sound/aacplusenc/Manifest
+++ b/media-sound/aacplusenc/Manifest
@@ -1 +1 @@
-DIST aacplusenc_0.17.5.tar.gz 547953 RMD160 c59efc3a3f8126b4650b304a043f176b80078d82 SHA1 1f862538c6f3ead4c5440d2649ecff4645c32a07 SHA256 318df58a86ac0647d6bfbcd8766fe301ad2ed08ffb4ef4e016e088f4dceb1669
+DIST aacplusenc_0.17.5.tar.gz 547953 SHA256 318df58a86ac0647d6bfbcd8766fe301ad2ed08ffb4ef4e016e088f4dceb1669 SHA512 75dadadfcddc551217ad71f021d6f4a190271428dc32603ec64429024ad7747884f5080f0cbb43a79895db527e9802cf3693b0dbf90f8b4b7023ea7e9bb43873 WHIRLPOOL fd9ed148d65ed3cfaeecea23b659be9f67bac16ad5527ecf6eeb50f59620cdb5903b7947c10016134cbcbeee2aa7912d19596eb8a4ae1a6e46a035eb22973649

diff --git a/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
index 547f7ab..934c4cc 100644
--- a/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
+++ b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="High-Efficiency AAC (AAC+) Encoder"
 HOMEPAGE="http://teknoraver.net/software/mp4tools/"
-SRC_URI="https://ppa.launchpad.net/teknoraver/ppa/ubuntu/pool/main/a/${PN}/${PN}_${PV}.tar.gz"
+SRC_URI="http://ppa.launchpad.net/teknoraver/ppa/ubuntu/pool/main/a/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
@@ -21,14 +22,14 @@ DEPEND="${RDEPEND}
 # 3GPP patenting issues
 RESTRICT="mirror test"
 
+PATCHES=(
+	"${FILESDIR}/${P}-asneeded.patch"
+	"${FILESDIR}/${P}-libm.patch"
+)
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	# Fix linking order (bug #393137)
-	epatch "${FILESDIR}"/${P}-libm.patch
-
+	default
 	sed \
 		-e 's:LDFLAGS:LIBRARIES:g' \
 		-e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \