Use system AR, bug #464710, thanks to Michael Mair-Keimberger for the patch

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 166 insertions, 1 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index 5083cdc1aba0..b7e53a14fe2e 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.45 2013/04/05 11:04:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.46 2013/05/30 16:45:36 thev00d00 Exp $
+
+*mediatomb-0.12.1-r6 (30 May 2013)
+
+  30 May 2013; Ian Whyman <thev00d00@gentoo.org>
+  +files/mediatomb-0.12.1-system-ar.patch, +mediatomb-0.12.1-r6.ebuild:
+  Use system AR, bug #464710, thanks to Michael Mair-Keimberger for the patch
 
   05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> mediatomb-0.12.1-r5.ebuild:
   Stable for x86, wrt bug #464566
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-system-ar.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-system-ar.patch
new file mode 100644
index 000000000000..349bf7d8da74
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-system-ar.patch
@@ -0,0 +1,35 @@
+--- configure.ac	2010-04-08 00:38:51.000000000 +0200
++++ configure.ac	2013-05-30 12:27:55.620514386 +0200
+@@ -318,6 +318,10 @@
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_PROG_GCC_TRADITIONAL
++AN_MAKEVAR([AR], [AC_PROG_AR])
++AN_PROGRAM([ar], [AC_PROG_AR])
++AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
++AC_PROG_AR
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+--- build/Makefile.in	2010-04-08 00:40:15.000000000 +0200
++++ build/Makefile.in	2013-05-30 12:25:55.310337928 +0200
+@@ -50,7 +50,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ libmediatomb_a_AR = $(AR) $(ARFLAGS)
+ libmediatomb_a_LIBADD =
+--- tombupnp/build/Makefile.in	2010-04-08 00:40:16.000000000 +0200
++++ tombupnp/build/Makefile.in	2013-05-30 12:26:18.420371823 +0200
+@@ -48,7 +48,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ libtombupnp_a_AR = $(AR) $(ARFLAGS)
+ libtombupnp_a_LIBADD =
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r6.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r6.ebuild
new file mode 100644
index 000000000000..a6bc2fa43312
--- /dev/null
+++ b/net-misc/mediatomb/mediatomb-0.12.1-r6.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r6.ebuild,v 1.1 2013/05/30 16:45:36 thev00d00 Exp $
+
+EAPI=5
+inherit autotools eutils linux-info user
+
+DEB_VER="4"
+DESCRIPTION="MediaTomb is an open source UPnP MediaServer"
+HOMEPAGE="http://www.mediatomb.cc/"
+SRC_URI="mirror://sourceforge/mediatomb/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+curl debug +exif +ffmpeg id3tag inotify +javascript lastfm libextractor +magic +mp4 mysql +sqlite +taglib thumbnail +zlib"
+REQUIRED_USE="
+	|| ( mysql sqlite )
+	taglib? ( !id3tag ) id3tag? ( !taglib )
+	thumbnail? ( ffmpeg !libextractor )
+	ffmpeg? ( !libextractor )
+	libextractor? ( !ffmpeg !thumbnail )
+"
+
+DEPEND="mysql? ( virtual/mysql )
+	id3tag? ( media-libs/id3lib )
+	javascript? ( >=dev-lang/spidermonkey-1.8.5 )
+	dev-libs/expat
+	taglib? ( media-libs/taglib )
+	sqlite? ( >=dev-db/sqlite-3 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	libextractor? ( media-libs/libextractor )
+	mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 )
+	ffmpeg? ( virtual/ffmpeg )
+	thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
+	curl? ( net-misc/curl )
+	magic? ( sys-apps/file )
+	sys-apps/util-linux
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	enewgroup mediatomb
+	enewuser mediatomb -1 -1 /dev/null mediatomb
+}
+
+src_prepare() {
+	local p dd="${WORKDIR}"/debian/patches
+	sed -i -r '/^[-+]{3} /s:[.][.]/::' "${dd}"/* || die
+	for p in $(<"${dd}"/series) ; do
+		epatch "${dd}"/${p}
+	done
+	epatch "${FILESDIR}"/${P}-libmp4v2.patch
+	epatch "${FILESDIR}"/${P}-system-uuid.patch #270830
+	if has_version ">=dev-lang/spidermonkey-1.8.7" ; then
+		epatch "${FILESDIR}"/${P}-mozjs187.patch #435394
+	fi
+	epatch "${FILESDIR}"/${P}-libextractor.patch #435394
+	epatch "${FILESDIR}"/${P}-inotify-hard-links.patch
+	epatch "${FILESDIR}"/${P}-thumb-cache.patch
+	epatch "${FILESDIR}"/${P}-libav9.patch
+	epatch "${FILESDIR}"/${P}-avformatcontext-pointer.patch #446922
+	epatch "${FILESDIR}"/${P}-system-ar.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable curl) $(use_enable curl youtube) \
+		$(use_enable debug tombdebug) \
+		$(use_enable exif libexif) \
+		$(use_enable ffmpeg) \
+		$(use_enable id3tag id3lib) \
+		$(use_enable inotify) \
+		$(use_enable javascript libjs) \
+		$(use_enable lastfm lastfmlib) \
+		$(use_enable libextractor) \
+		$(use_enable magic libmagic) \
+		$(use_enable mp4 libmp4v2) \
+		$(use_enable mysql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable taglib) \
+		$(use_enable thumbnail ffmpegthumbnailer) \
+		$(use_enable zlib) \
+		--enable-external-transcoding \
+		--enable-protocolinfo-extension
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}-0.12.1.initd ${PN}
+	use mysql || sed -i -e "/use mysql/d" "${ED}"/etc/init.d/${PN}
+	newconfd "${FILESDIR}"/${PN}-0.12.0.confd ${PN}
+
+	insinto /etc/mediatomb
+	newins "${FILESDIR}/${PN}-0.12.0.config" config.xml
+	fperms 0600 /etc/mediatomb/config.xml
+	fowners mediatomb:mediatomb /etc/mediatomb/config.xml
+
+	keepdir /var/lib/mediatomb
+	fowners mediatomb:mediatomb /var/lib/mediatomb
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "MediaTomb has been built with MySQL support and needs"
+		elog "to be configured before being started."
+		elog "For more information, please consult the MediaTomb"
+		elog "documentation: http://mediatomb.cc/pages/documentation"
+		elog
+	fi
+
+	elog "To configure MediaTomb edit:"
+	elog "/etc/mediatomb/config.xml"
+	elog
+	elog "The MediaTomb web interface can be reached at (after the service is started):"
+	elog "http://localhost:49152/"
+}