[media-sound/amarok] Patch for >=autoconf-2.65

4 files changed, 151 insertions, 2 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 9697de1f..c35283e4 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for media-sound/amarok
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.344 2009/11/09 18:18:36 fauli Exp $
 
+*amarok-1.4.10_p20090130-r4 (26 Jun 2010)
+
+  26 Jun 2010; Serghei Amelian <serghei@gentoo.org>
+  +amarok-1.4.10_p20090130-r4.ebuild,
+  +files/amarok-1.4.10-fix-autoconf-2.64.patch:
+  Patch for >=autoconf-2.65
+
   23 Jan 2010; Roman v. Gemmeren <strowi@hasnoname.de> amarok-1.4.10_p20090130-r3.ebuild
   reverted previous change because of changes in base.eclass + kde-sunset commit #08ea9a8
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 916f406d..cc718371 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,3 +1,4 @@
+AUX amarok-1.4.10-fix-autoconf-2.64.patch 429 RMD160 1b230d304ec6d014a94efa89fdc96fca78c6b22d SHA1 b9cc160a16eee01b729a4b5bc10a78f656ed0149 SHA256 9302c6f8003b0f9b61f2b4fcb91141e2de5790eb84ed8a82c87a7f3152b1d366
 AUX amarok-1.4.10-gcc-4.3.patch 271 RMD160 facfb2796b871f3b3a5cb0c5e2268386950b3801 SHA1 c86f458ba6ae8d5b78a047852f9f2699e6da2908 SHA256 b96e976276f5c87265ecdb62b596f6f2e91c921130b833b0e395f2b50c9fa9cc
 AUX amarok-1.4.10-gcc44.patch 4085 RMD160 bda16ee1d016cd158654b3f80faa413eaa7a6543 SHA1 f5c7eeea6ff80d6e634465517face69f3f344516 SHA256 b94338af91e5a108c39b100162f38bfe53d6c94fb9ed4c175f09de68df1c1989
 AUX amarok-1.4.9.1-libmtp-0.3.0-API.patch 1912 RMD160 475852fde4ad1e27cc093d9435a4b525492e0156 SHA1 b211ad82d9abc49dd3a51260ba597cfaa78d9f6b SHA256 87583a40c4e13eae7a5364dc5b98dd83885c216e662c05c4de7c1de9739f6d9c
@@ -6,5 +7,6 @@ AUX amarok-libmp4v2.patch 2882 RMD160 f0786378bf963e8d10db49631bb0981facd9ed90 S
 DIST amarok-1.4.10-post20090130.diff.tar.bz2 4050 RMD160 e1b871213d7658081ffd396a1a208f97c3f10752 SHA1 8aa7492e91529ce1e01f3d2ee8183b7d7da7cb83 SHA256 64924546008abf88f7f776b27afe3de539defcd212c79c62c6abd90a7174dbe0
 DIST amarok-1.4.10.tar.bz2 12812583 RMD160 f86c71dd0459e0cf1ff586cd6de240ca6501cf62 SHA1 cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd SHA256 4b28f86e81447b94d33c35aa0cff65d59d85da74fde2a86c5c7862c048509c9b
 EBUILD amarok-1.4.10_p20090130-r3.ebuild 3198 RMD160 c88ab563457a4dc8c226d41a32dc8b0c9a8b7418 SHA1 f98f41ac480a9c8c0d99c939fc2de1aa514a4f6b SHA256 17a78dbb7d26439930a18b9148144d3862dce12bf3201d2872fde27ac75dd66f
-MISC ChangeLog 55974 RMD160 f5ec9d05c248e31fbfe23132629a218b8304098f SHA1 a6246bab83dac87db1ada0f03fa9a9bb47244e31 SHA256 b194e3da79b7ca94ea45e9327a2ea680b0ef4aaa2968dda2883f0e0f0c54d816
+EBUILD amarok-1.4.10_p20090130-r4.ebuild 3250 RMD160 2311b0259534e5a2c873b061adf6915726ee64f0 SHA1 a7faaab08cb64781f66bbb86fea5701bf054ff5c SHA256 8b22a0bec5bffab86c1463e2f92eb53bf6e9562407687a0c418ce64ec7d1e2b6
+MISC ChangeLog 56184 RMD160 8d1bd59d9fc35abefb2fb4e8395168a54cb9eae1 SHA1 02e700998beb892635e5bada8497b51459d4d259 SHA256 ac53efad9506d8e9fda0212095fed2595c48964f990fcb6c86f86222aa57b545
 MISC metadata.xml 2160 RMD160 60852f091cb201337c8322cad498466cd63fee1d SHA1 15af0f24c3490806e06700d05bf5341779b2b26b SHA256 49e722b9b2a370e01b0efc327486bc3e02446e0c2b4b8047dffad765a1992357
diff --git a/media-sound/amarok/amarok-1.4.10_p20090130-r4.ebuild b/media-sound/amarok/amarok-1.4.10_p20090130-r4.ebuild
new file mode 100644
index 00000000..a69266b3
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4.10_p20090130-r4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild,v 1.8 2009/11/07 00:39:24 ssuominen Exp $
+
+EAPI="2"
+
+ARTS_REQUIRED="never"
+
+LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
+fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
+pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz
+zh_CN zh_TW"
+
+LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
+
+USE_KEG_PACKAGING="1"
+
+inherit kde
+
+PKG_SUFFIX=""
+
+MY_P="${P/_*/}"
+S="${WORKDIR}/${MY_P}"
+
+SRC_URI="mirror://kde/stable/amarok/${PV/_*/}/src/${MY_P}.tar.bz2
+	mirror://gentoo/amarok-1.4.10-post20090130.diff.tar.bz2"
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+LICENSE="GPL-2"
+
+SLOT="3.5"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="mp4 mysql +amazon opengl postgres
+visualization ipod ifp real njb mtp musicbrainz daap
+python"
+# kde: enables compilation of the konqueror sidebar plugin
+
+# Blocking previous amarok-1.4:0 versions
+RDEPEND="
+	!<media-sound/amarok-1.4.10_p20090130-r2
+	=dev-lang/ruby-1.8*
+	>=media-libs/taglib-1.4
+	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+	ifp? ( media-libs/libifp )
+	ipod? ( >=media-libs/libgpod-0.5.2 )
+	mp4? ( media-libs/libmp4v2 )
+	mtp? ( >=media-libs/libmtp-0.3.0 )
+	musicbrainz? ( media-libs/tunepimp )
+	mysql? ( >=virtual/mysql-4.0 )
+	njb? ( >=media-libs/libnjb-2.2.4 )
+	opengl? ( virtual/opengl )
+	postgres? ( virtual/postgresql-base )
+	real? (
+		media-libs/alsa-lib
+		media-video/realplayer
+	)
+	visualization? (
+		media-libs/libsdl
+		=media-plugins/libvisual-plugins-0.4*
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+RDEPEND="${RDEPEND}
+	app-arch/unzip
+	daap? ( www-servers/mongrel )
+	python? ( dev-python/PyQt )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.9.1-libmtp-0.3.0-API.patch"
+	"${FILESDIR}/${PN}-1.4.10-gcc-4.3.patch"
+	"${FILESDIR}/${PN}-1.4.10-gcc44.patch"
+	"${FILESDIR}/${PN}-libmp4v2.patch"
+	"${FILESDIR}/${PN}-libmp4v2-2.patch"
+	"${FILESDIR}/${PN}-1.4.10-fix-autoconf-2.64.patch"
+	"${WORKDIR}/${PN}-1.4.10-post20090130.diff"
+	"${WORKDIR}/${PN}-1.4.10-desktop-entry.diff"
+)
+
+need-kde 3.5
+
+src_configure() {
+	# Extra, unsupported engines are forcefully disabled.
+	local myconf="
+		$(use_enable amazon)
+		$(use_enable mysql)
+		$(use_enable postgres postgresql)
+		$(use_with daap)
+		$(use_with ifp)
+		$(use_with ipod libgpod)
+		$(use_with mp4 mp4v2)
+		$(use_with mtp libmtp)
+		$(use_with musicbrainz)
+		$(use_with njb libnjb)
+		$(use_with opengl)
+		$(use_with real helix)
+		$(use_with visualization libvisual)
+		--with-xine
+		--without-nmm
+	"
+
+	kde_src_configure
+}
+
+src_install() {
+	kde_src_install
+
+	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
+	# from Portage, for security and policy reasons.
+	rm -rf "${D}${KDEDIR}"/share/apps/amarok/ruby_lib/rbconfig \
+		"${D}${KDEDIR}"/share/apps/amarok/ruby_lib/mongrel* \
+		"${D}${KDEDIR}"/share/apps/amarok/ruby_lib/rubygems* \
+		"${D}${KDEDIR}"/share/apps/amarok/ruby_lib/gem* \
+		"${D}${KDEDIR}"/$(get_libdir)/ruby_lib
+
+	if ! use python; then
+		rm -r "${D}${KDEDIR}"/share/apps/amarok/scripts/webcontrol \
+			|| die "Unable to remove webcontrol."
+	fi
+}
diff --git a/media-sound/amarok/files/amarok-1.4.10-fix-autoconf-2.64.patch b/media-sound/amarok/files/amarok-1.4.10-fix-autoconf-2.64.patch
new file mode 100644
index 00000000..e4056f24
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.10-fix-autoconf-2.64.patch
@@ -0,0 +1,16 @@
+diff --git filelight/admin/configure.in.min filelight/admin/configure.in.min
+index 0dfe378..5aa14b1 100644
+--- filelight/admin/configure.in.min
++++ filelight/admin/configure.in.min
+@@ -43,6 +43,11 @@ KDE_SET_PREFIX
+ dnl generate the config header
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+ 
++AC_PROG_CC
++AC_PROG_CXX
++AC_EXEEXT
++AC_OBJEXT
++
+ dnl Checks for programs.
+ AC_CHECK_COMPILERS
+ AC_ENABLE_SHARED(yes)