Fix building with GCC 4.4 and force revision bump because previous ebuild was missing entire src_install.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 68 insertions, 10 deletions

diff --git a/media-sound/xineadump/ChangeLog b/media-sound/xineadump/ChangeLog
index 2ad8a5dc9630..77fa22af95d3 100644
--- a/media-sound/xineadump/ChangeLog
+++ b/media-sound/xineadump/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/xineadump
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xineadump/ChangeLog,v 1.4 2009/04/30 19:31:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xineadump/ChangeLog,v 1.5 2009/07/05 16:00:11 ssuominen Exp $
+
+*xineadump-0.1-r1 (05 Jul 2009)
+
+  05 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> xineadump-0.1.ebuild,
+  +xineadump-0.1-r1.ebuild, +files/xineadump-0.1-gcc-4.4.patch:
+  Fix building with GCC 4.4 and force revision bump because previous ebuild
+  was missing entire src_install.
 
   30 Apr 2009; Brent Baude <ranger@gentoo.org> xineadump-0.1.ebuild:
   Marking xineadump-0.1 ppc for bug 252691
diff --git a/media-sound/xineadump/Manifest b/media-sound/xineadump/Manifest
index 66aa1ee0edcf..f09111115083 100644
--- a/media-sound/xineadump/Manifest
+++ b/media-sound/xineadump/Manifest
@@ -1,5 +1,7 @@
 AUX xineadump-0.1-gcc-4.3.patch 625 RMD160 b9a503e03674fbfcd4696b65379f7190ec5434a2 SHA1 a436b054c09d88f6468ebf32990139623e2a4b30 SHA256 9455c28ab2a3288b9c946dc7d477b11f256b33a7b0316b30f6f562c7f105395b
+AUX xineadump-0.1-gcc-4.4.patch 436 RMD160 4a8596c7898345ec67c38476671d519f70857a6f SHA1 77afc2d13c994fc1da6e3227a9245d35d9cc217f SHA256 d4a169d2799d7914ef8f31447377e49678acf7b7163e8f5fe9439ccd6af4851f
 DIST xineadump-0.1.tar.bz2 233413 RMD160 51ed874a51644f88e6af281c3080a3ad2c82afb9 SHA1 738e846c4cb4ded7b41910ef7b3ffe287077d712 SHA256 a00a3377be2df8bcb2639f7e9d40faaf531362e67bd13130764042611a2067eb
-EBUILD xineadump-0.1.ebuild 623 RMD160 22ce6b399d71f6f0fed6957f2e1bd5b593fe7cb4 SHA1 4c248b3f667b70126b24bdeb017747f7e4ad1fcf SHA256 e2779cf33fb69c1bad2d859b68f329ec17e67f5589f1878635870bfac38bd7d5
-MISC ChangeLog 807 RMD160 c1dd22b7729a02fe5bea669292d9a0b15fe508d0 SHA1 3a19b3d482cc538466c4d33d558583d7f6ef9d1c SHA256 773c0ee2a340518ff2f740bf82dc3d82f09a11a8348a3e74c0c4899345c66446
+EBUILD xineadump-0.1-r1.ebuild 764 RMD160 eb8e3213d40e2759e3ea7709118a8143626d492d SHA1 5f6fdc3fa8cacef94b82102deffcf1bb13ebd8ee SHA256 85e839e1f02cd1a1cc06f9007e3c52f1c4aa472ea836057f70dc32d5cb998511
+EBUILD xineadump-0.1.ebuild 761 RMD160 0b336b2888fda00ecacdb57c6b0819bc1a6644f7 SHA1 6bb23b94b52295c0d04cd88de32ef041424f2dd5 SHA256 6788fb6cd5142a53ae47efeb6d964a8dfbe6b8aabb92c9a77bfcbd21588b2c0d
+MISC ChangeLog 1094 RMD160 6c54bee89b7e8d62f0a5ca76d2e8b640ef9acd9b SHA1 027df49a2b654aef8bbce7c8b17ee822c3489287 SHA256 57bf58b69a7864bf9a6bcb1d6111e8b71f8054f4f492c6121153643384829f73
 MISC metadata.xml 160 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 SHA1 0c1bb16a7cc376ef35b87d8699ec9504718d36b9 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b
diff --git a/media-sound/xineadump/files/xineadump-0.1-gcc-4.4.patch b/media-sound/xineadump/files/xineadump-0.1-gcc-4.4.patch
new file mode 100644
index 000000000000..f8e1ca1ef848
--- /dev/null
+++ b/media-sound/xineadump/files/xineadump-0.1-gcc-4.4.patch
@@ -0,0 +1,11 @@
+diff -ur xineadump.orig/src/waveencoder.cpp xineadump/src/waveencoder.cpp
+--- xineadump.orig/src/waveencoder.cpp	2007-08-05 02:39:36.000000000 +0300
++++ xineadump/src/waveencoder.cpp	2009-07-05 18:57:47.000000000 +0300
+@@ -19,6 +19,7 @@
+  ***************************************************************************/
+ 
+ #include "waveencoder.h"
++#include <cstdio>
+ 
+ #define WAVE_HEADER_SIZE 44
+ #define PCM_BUFFER_SIZE  0x10000 // 64KB
diff --git a/media-sound/xineadump/xineadump-0.1-r1.ebuild b/media-sound/xineadump/xineadump-0.1-r1.ebuild
new file mode 100644
index 000000000000..30442ff211f7
--- /dev/null
+++ b/media-sound/xineadump/xineadump-0.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xineadump/xineadump-0.1-r1.ebuild,v 1.1 2009/07/05 16:00:11 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Utility for Xine decoding support in transKode"
+HOMEPAGE="http://sourceforge.net/projects/transkode"
+SRC_URI="mirror://sourceforge/transkode/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/xine-lib
+	media-libs/alsa-lib"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-gcc-4.4.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS
+}
diff --git a/media-sound/xineadump/xineadump-0.1.ebuild b/media-sound/xineadump/xineadump-0.1.ebuild
index de961a0165f8..caefe872cb57 100644
--- a/media-sound/xineadump/xineadump-0.1.ebuild
+++ b/media-sound/xineadump/xineadump-0.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xineadump/xineadump-0.1.ebuild,v 1.4 2009/04/30 19:31:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xineadump/xineadump-0.1.ebuild,v 1.5 2009/07/05 16:00:11 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="Utility for Xine decoding support in transKode"
@@ -13,12 +14,18 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="media-libs/xine-lib"
+RDEPEND="media-libs/xine-lib
+	media-libs/alsa-lib"
 DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-gcc-4.4.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS
 }