Fix building with newer libav api. Fixes bug#390821.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 34 insertions, 64 deletions

diff --git a/media-sound/potamus/ChangeLog b/media-sound/potamus/ChangeLog
index 977af987e0b4..4749f9d00c9b 100644
--- a/media-sound/potamus/ChangeLog
+++ b/media-sound/potamus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/potamus
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/ChangeLog,v 1.9 2011/04/21 19:36:14 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/ChangeLog,v 1.10 2012/04/21 09:01:15 scarabeus Exp $
+
+  21 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> -potamus-0.11.ebuild,
+  potamus-0.12.ebuild:
+  Fix building with newer libav api. Fixes bug#390821.
 
 *potamus-0.12 (21 Apr 2011)
 
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
index d56a4604e3c1..f1cea9088088 100644
--- a/media-sound/potamus/Manifest
+++ b/media-sound/potamus/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST potamus-0.11.tar.gz 126917 RMD160 3229927fad4bee354349eee010ab5898bd428033 SHA1 9cabadb82180a6ef65ae967bc8fa5bff04db91ff SHA256 6465dffd23af941b027960a05099502c7885faf556b3322b0f6734b19e26eedf
 DIST potamus-0.12.tar.gz 127788 RMD160 ac1550e9884baed26d83c60bbfdf00225f3fc689 SHA1 cbedfc63697a2b3978cc55bd804576f5aaf3156e SHA256 5034e09c8646cbb299f895541e155b9d7012597210bc8b0ba213812928525e2d
-EBUILD potamus-0.11.ebuild 1039 RMD160 3f4df46af26bb414b3f5d36e2dad4c77a2266586 SHA1 a0aee6c9c5acd04ce14e3be613d9de955c3124c0 SHA256 c3f32cdaa84350157aa64954bc6be91dd44d16ed35fe066605dc8f27df10995e
-EBUILD potamus-0.12.ebuild 902 RMD160 eeb9a398bb08eaf5e1a075c73a61701d566cfa07 SHA1 2dea27176680b527fb4ccb335f67dc5ffbd58ea4 SHA256 e5a8d6e75074648801fe383b3115e30afef04f388b7e3d2b6feaf9669dba88a0
-MISC ChangeLog 1682 RMD160 9a6723ccc3f4d5303e73ee7d7a1eb87ce660df43 SHA1 6031b9ac963ce76354572cbbbf354a8a5556615e SHA256 4d0ddec5281d1eb048f5b54b5f72db358e45bbda4b5852ee65e6a1b98c9b6c5b
+EBUILD potamus-0.12.ebuild 956 RMD160 b65e4fd5701ec06fb6020bfe39be410198a3ac01 SHA1 67fadcb174a5644fca8555a0219b20a80459f6e4 SHA256 ef5f6b49f2078237aac3cb1d157de33748d4abd635b9ea8940eee037e846bb4f
+MISC ChangeLog 1839 RMD160 42962ebfddefceb4409334ea3d68d22153afc53e SHA1 ee7087f69f29276dc7712b41d0f99d06f62d3d31 SHA256 133ad121e5beae9c1649b0c0036b18a23580e9da8f9499f41c8145061eb039cf
 MISC metadata.xml 219 RMD160 1311be2ec3797b97e67acd02afa5083523d06721 SHA1 8d1e8571dd1d104255107dd46473ddc08e0de932 SHA256 5cceaad9e92392f27e672ac3a4c7127bf5b8f60a737788cd6d4856568e2f795c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNsIc7AAoJEEqz6FtPBkyj94IH/jGQ7ldibTHICrzHeMQmnFVE
-KlPBIK/dpMH+mIUq6oHAfTXY9akRmDKH2bw+rXZmoDVnkRHVEpTsbbelk5tBjtAk
-Jq9JTQaE9EWeaQirVCEJMFRflNdnTMIR7q2Itj0RylsIycCFafvEPA4ROlFL/O3e
-Lpt4MHm93azniHTy0NGfLoMbnhgKneHFYJzbj0q8tlHomXVZFSNmj3iffuydhJ5N
-mZRj+Uu89w/jsTystzDYidDdVkmwH4pA11WPeR7Ge5kO4ppQ+05pWAYc6SVFgRCZ
-WTO8RrRbQVcyHyC35HrK6GJDCYC04IGUaWYql17gO/Cv1R7aqi1UrQdaKw3RU9g=
-=/7mN
+iQIcBAEBAgAGBQJPknfQAAoJEOSiRoyO7jvo910P/1Xki1u9RIGDVGlj7MmfIlw1
+LFCCUehQOmKvXa4bo0KU62IuaozIps1Bjwkzdirjz6Yv0JsSFO3S/6pdaxJlPlmH
+k45kjR7opNAYc2inPf6m3QF5yQsTxLCV8M/q59rmAJSU/TcJaIL0Gla28HsI9cIw
+gt/74BvoGlea4U4FFkch0ewZkgRsQIQhUsapQ5jIYKXgfPNFe9FPkTHVhd5fkeKD
+yE58aIa1CgCJxxS978hXcKyz5uPumrYpfoOaWqps4cGjb3yIX8BJD2j7VBkS9lgx
+PUmvl54uRKTsy1pYBR6hHx7uFSdiVe5BGM7J01JvrQ35iG2z3ZSZOQJj6nOGyy5q
+3eX+Ok88OEtaDlflXinqO8eqjOc9bM4MiRG++970AqUQG7IGt0wyOEV0H4MJLn0E
+XfgAgYFA3mbApZ0M1ZOTNleO0fnXwjWO8eWfhdo4Xxngv4esJwoH6RntrISe6PL0
+/k96HNZR/w7Jlc3enbnho8uyRYRmx6JOFaf6R86unURM/YGNBEbu7ira8v6nnn5G
+PilSUsO7Fup+OevHqD4+AHUNlsryey4uxbZVJofAlOzl1gjqtM9AhqoB1a4+htgq
+pn0n9g5arfl9HiQJCAx9JySLo5b6cuuVnsA0s107SFljFaphvoB+zdtkjrOF5/Ws
+9+gbCWlQf9Kx9ZJH1Yqj
+=bqDg
 -----END PGP SIGNATURE-----
diff --git a/media-sound/potamus/potamus-0.11.ebuild b/media-sound/potamus/potamus-0.11.ebuild
deleted file mode 100644
index 781fae401152..000000000000
--- a/media-sound/potamus/potamus-0.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/potamus-0.11.ebuild,v 1.2 2011/04/21 19:36:14 radhermit Exp $
-
-EAPI=2
-inherit gnome2-utils
-
-DESCRIPTION="a lightweight audio player with a simple interface and an emphasis on high audio quality."
-HOMEPAGE="http://offog.org/code/potamus.html"
-SRC_URI="http://offog.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	>=gnome-base/libglade-2
-	media-libs/libao
-	media-libs/libsamplerate
-	media-libs/libvorbis
-	media-libs/libmad
-	media-libs/audiofile
-	media-libs/libmodplug
-	virtual/ffmpeg
-	media-libs/flac
-	media-sound/jack-audio-connection-kit"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README TODO
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/potamus/potamus-0.12.ebuild b/media-sound/potamus/potamus-0.12.ebuild
index 048ea12ad0f7..0eac2213e2bc 100644
--- a/media-sound/potamus/potamus-0.12.ebuild
+++ b/media-sound/potamus/potamus-0.12.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/potamus-0.12.ebuild,v 1.1 2011/04/21 19:36:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/potamus-0.12.ebuild,v 1.2 2012/04/21 09:01:15 scarabeus Exp $
+
+EAPI=4
 
-EAPI=2
 inherit gnome2
 
 DESCRIPTION="a lightweight audio player with a simple interface and an emphasis on high audio quality."
@@ -28,7 +29,14 @@ RDEPEND="x11-libs/gtk+:2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	gnome2_src_prepare
+
+	sed -i -e \
+		's:CODEC_TYPE_AUDIO:AVMEDIA_TYPE_AUDIO:g' \
+		src/input-avcodec.c || die
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README TODO
+	default
 }