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

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

4 files changed, 169 insertions, 22 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/Manifest b/net-misc/mediatomb/Manifest
index 939a86460251..5e62c9dffe2c 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX mediatomb-0.12.0.confd 805 SHA256 21b1b9d31a6db76c5c1ccfbf00e5cd553eecfeb0e2bb161ccc024eab2243293c SHA512 74d2866c749272fe71e97e73ddf349070c51879967e7fd55716bb2dfc49f89d80d0655ac05e01fdb107fb057a62540116dcebdda87840b16c7bd11962c12065c WHIRLPOOL 3b545b860f61c5a91db2d9ba0ee8a30b572bb073ae7a82456488a2d8bacfa03e89218722d6e072ed7ab32f995bc5465f8da53c5bdaa4a049eb5d7caa8a71c5d8
 AUX mediatomb-0.12.0.config 6180 SHA256 cb43e92639e5e53908567c050c9a2fc0e5c349fd11a149414590c2c6a402b4d2 SHA512 310f408d6925ac7c2a4b5cbb0a8a854ba41c8aaa678b1e1805649e73be86d9e438da2fce7731df0e244b78271da98751e66624af15328633833603f7645be081 WHIRLPOOL abc2ad05aa92fa540ea4c69db24e205fa84babd308ff769eda68a7e4d68c004b96191c63566db71a308a2c309b10999ab9925af8e00cbf9caa90e16d90467871
 AUX mediatomb-0.12.0.initd 541 SHA256 8dfe99d619a3384b2fb9105051daae1fc6c88402364d4203b21344f766a6b696 SHA512 5aab06ea989986350f6002f67946a9abd0e3c4ec538f4b143454ed92fc5384344db862cf190b632f6b343b4e5fa268b55922ec1eafa3859705185c14af066e47 WHIRLPOOL c07afad49c46c633e32ac33a82de8316fc0ccf2dbdb65662f79bcf40b4a5e991ca710648537278f4e6eb82afd34b47df22c713b86ca6bececf79183126cfdac8
@@ -14,6 +11,7 @@ AUX mediatomb-0.12.1-libextractor.patch 21074 SHA256 19f71fc190683056bb5f920a012
 AUX mediatomb-0.12.1-libmp4v2.patch 5893 SHA256 d39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84 SHA512 8e712c13de6e129a9a0b0805fc00c3af92bc3cedb583fa3e068c27d57ed52ad3b4c777bd92a6b073e2fee88376a28ce4d2467e97ab8ae2f9ea3ed7a64a0e45d3 WHIRLPOOL 6d8c1c06db3aed67f920f40176cd389ac84d7294b78ec5ca3f61920977fde8cbe49dac6bffe1050f97aca15af5fa4a743d947e3cba8f6a3ef9b0370bff7dac67
 AUX mediatomb-0.12.1-mozjs185.patch 22839 SHA256 3960961f1fbe46baff3956ea2fa94b4dc193c0d278b8646cda1f4cee26812f59 SHA512 df66b6818ec28aae494b12c50981cc9b2762796a4af6f2c9d1dc813148f2fd97c8816851a3fb871213e88dcd1a331a06fae9f20a23df9302c9b41f2446fbd28c WHIRLPOOL 5191c0a823e2b9b054c9a5ec9b8d1f92dc5038bee9e0043e13d10b92740f3f69c05cffcb1dcb67273ad1d8443149f2e6a36d70638e37fd28346ec0ddf642cc9f
 AUX mediatomb-0.12.1-mozjs187.patch 8019 SHA256 4f502ead6b2620d188b2e8eeb01e353960d0527ffa46edb7dd73793d2e1343e2 SHA512 dc647eb34e508ac3ccdfc578b30e181da5aad60677a912e7a02967226a22e9f61f3123d84422c9ccd27cbba451b928b939cab3550286342bb662a319b097c66b WHIRLPOOL c09ccd53ca0d619e71e7a1fe3fb223896c8176f212b489012bdc6f5e894ac375622168448225b6cf0527ce527e426a26360ea22a520a4c66bc1a804ed0eb616a
+AUX mediatomb-0.12.1-system-ar.patch 1008 SHA256 473ebc6ba78fb21c21512c4e61be8e820f097150e28e2098a04a66a863293029 SHA512 7b07d96769b18f22b3d096ff949cd176fd5f1eb2305fc7dd0df7080326ba1c33ac17b18875453c24d585c4334834aac42d80faac511c11d08c9fc3185f4fc94d WHIRLPOOL 1ac74952948bdc8eee574848ee3febd68dba5dc5a6393adfc7e97ba69bf5a132133a7345677d9ad255a4273469e909535310101dc8c66b53ff7bd9b2d31e4397
 AUX mediatomb-0.12.1-system-uuid.patch 954 SHA256 ec6ad3d71a7ea9ed3adb284aaa6bf57f435f05738f4e20d1f49eefa7e8051780 SHA512 68ac4bca71ac5f2e52daffb58d54199ddc87a7cfd02b89e93bc0c1b4496b95f6c82c0d362d36f37d3a9076c3bfb5d018df809fb485ca687923e5e1b78e6bf4bf WHIRLPOOL 88adbe3f19493314609dea727c6b57b272095396358a14921e966cf3cfab86a3754fe5321d855b3980f7c22a38bf7c18d774b58a60f8a82abed945dc047b24f9
 AUX mediatomb-0.12.1-thumb-cache.patch 8358 SHA256 83ac5acfe6a71feeeabe6f6dff658fa70d460d2074323fafeb8ce85146fcef0e SHA512 492f5aa3fc439f234577ec598e03de3ae8beacd1028114bc57ae4335ef55d41bcad5301e8cba2e4064891a8515cc28655d4ccd6d5ab04aef96f75506b2bd9a3e WHIRLPOOL f1f8c84ae6b952abf14f368b5a59815631aea1a37e2059fc36d22e78219eac5d4921860a6c4bd6244704e82e90b8d89f2d0cf16239c8a5c5e33024b0d13f900e
 AUX mediatomb-0.12.1.initd 954 SHA256 7a12a5e4aac11e1e3abae9522ecea10527c813b12b51258f47518868c23c94c4 SHA512 6d8e3f95a8342e5a8097f17f1b44a52afad6c89cff59b8cbe8ccc947bdc41e4c20ecfc0f40fee3b64617b240b7f5d3d8e9c1c129eeb9cf5a7686982cdfddafe9 WHIRLPOOL 7d019d5f13278b3bf8755b79bb191beeaed7daf5843a24aa0bbe67dda6aa029b71171a0276322836c0ffaa5f43f0c39b0af1f0cb8f242667748b01e097ba4de0
@@ -21,22 +19,6 @@ DIST mediatomb-0.12.1.tar.gz 1240612 SHA256 31163c34a7b9d1c9735181737cb31306f29f
 DIST mediatomb_0.12.1-4.debian.tar.gz 34161 SHA256 b1e48d01f4f99362ef554c9220df21c48f6b76ad716e29427948a524e5c84d90 SHA512 21f876de3ec0b24bfcb37d387b5337d574f2e62e12944547f0a2e69e34532e296097fd04cce9941e994c3823a7bb863172db4fc3024d490f2a2359b7f0adb079 WHIRLPOOL ad38bc64411f1aac25672c522b862401897f0e4225ea21bab317a1c3311ef87a3e688f6ea1abb5a30eeb4cb3165dabbbff158eb5d4267dba901a54f15017078d
 EBUILD mediatomb-0.12.1-r2.ebuild 3889 SHA256 923070cbdadb4f1b04e604371734a28f3a6db7ae3270e27c880dddd432e5cb06 SHA512 33217cf659c746244293bbcfdcec90e6499cba612cbbfe8d12f425be383cd28ee24a928ebfafb239bb47eebade6fc75821295ac0bc3972c8f720f12b0cf00d95 WHIRLPOOL 6ba2c8038eb3213ed552a6772d9782b45f5cfa69a46912d55dd273fcb2df8927edcb94523077d1aa45d8fbe14dc07686aec45f76de648df181d5691702c62488
 EBUILD mediatomb-0.12.1-r5.ebuild 3960 SHA256 6aa5da3e77734fd39edf772c69b0d04b20e4be2b12f90c0489d5078b6ae42881 SHA512 105862b673e6f25e514c05a48bb35ab04ae45c076ad225df3e12bab0333ef8dba1bd735243cb94f03725fe82cc999b3576e4ebf945d7cddc341d1bf87376853b WHIRLPOOL e8cf5c400b17e0713d7f04168a495be2628fe24c8a339b86144245ddef008f26a980b612bc40cbf45a0b3851608cbc5eb195567702733e2bda3e9cd64eeb0b5f
-MISC ChangeLog 8341 SHA256 453d88d01705dd74ec01b0842bb7f33f21ee8244e601c1cf51e5de25c41ef25f SHA512 f49c4c62b52383bf8da7dae59d150529249a4eeddba3b0399a741879aeb4326cee04c05ae2c5166c379952e48e86f90f73b0be1d63c5a59a3135e10ed3d7431c WHIRLPOOL 5cba171323152a4b354c86dba52c084a6a8869a832ee0e99a37e631e1c0e765eb0a79978f05a5bb55767c928de8fdff7fe83867788cdc4685cbdd12730c7e214
+EBUILD mediatomb-0.12.1-r6.ebuild 3794 SHA256 dd2f768709a416a70190de968af542832cd5001371f889d649272c2ffb8e9c9c SHA512 7fd8d62955ce34c755dfc92b8ca29e1039cb1656d68ab7bc6d2de4e54348639e53e7fa7aaacb91416f7bb642a6df5d1f41e8f40c074654ae7a22b9d4722c9d4a WHIRLPOOL 8034d8c57da54939d6a1dcfefabb31d0f2c9bf03d15728965189bb6c1d764bc00d671a6e058e94731b3b2e37af00d8fd09bec8e5fe48c7e7637513a979b0e958
+MISC ChangeLog 8583 SHA256 dd7dbce118ca95dbdaa815e1e742edb53cc74ed919673cb7d4a3070dba444182 SHA512 c38bb2e780eea68379b018aa870e477ca956ed4d0918017c0658c6a38a3ee828e7e4a8b1c7450317e430dfe5860d9818ef2d6e4f8cd7f4bf7fd7fd8013497009 WHIRLPOOL f75d086d79822a989c4afc2d12476dfb373c000311efc5b9da77195f97037690a72b4a209d16910de9f9e444a7e7f4496298804afab6661797ca34e66424d065
 MISC metadata.xml 961 SHA256 52b33344d8a9797cc363a7e2b3b1226430ed56d619b922f2e7beff48a9488c3e SHA512 3c9c78a0b63f927d4d22b491b58d5db52dffe9b1148470a0627cee1ce2cd981c7c8cc49a615b70d481cb723f352e23296b5cab9e8c281ec36c600d34f57d2ef5 WHIRLPOOL 5273d00375adfcaa507b02aa66407af4f484cbafae9099b4333a9b752c00e9ba5e98e6e082a85ed46686973dfd6d9b2e1eadc891780774666f0d3a999fbed2a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJRXq/CAAoJELp701BxlEWfwrAQALqgKn+wlSRHdYdNCn9Cr6KH
-J3b9xzZ7w5VrqqlQC08PbkSP/9PkaH4WB7xF5TPGUhV5awIfGjClz+TZi8hvk6wv
-s8JYtmNaZgjRRkU3bnRyYUsgP6yaNoacz7CklWFHurMnAqopD9USNOheIcvGxSpz
-1M7Wpix0Xwb3BeyayK+km3SusWQpO2nm0Ho613s2MWUttTQQVTeiY727B1gll4Fo
-xGsuqAYDbOai89jyfdE5BpK7WPzhiFl8S0yzYLlXyvQE1/1x1sgTVvkUuJ+J+6pE
-tZhw/dPUBNeNJARIbbNBp4BdNA37sk7hI1CiF5YrcBegyqsqeeNiO3DIx02fuxxK
-P76jwntfL8AtlJtWOnPXrVPM5ZeBiGRniW6FC1sdu66ArQnxRjki3Ja7rGL3cYu9
-w1PPGdDYy5yGA0wIr3S84PHgvOEAp6kMkxnt9RL/flNFZ8BjziUYuVOW2+bcpDlq
-JhntdrUoJtuxQOFefTeOJ+EudIrvAv0A49fOy/aOfbv28tRY+kw4xNT9E1KewKOH
-K2Sq2e/3mj0/KYMj2qI2tj4QXCCSfdCOZccEKPeIKSvxfAa0FzCRIQbbAB294Kev
-QQR0K+ApOnyL5VOfzSPtkYc0ROt14b4jgEXHMpGGJYmUUpEG0e/pvGPPCW0ZULuk
-EDoYgbA9v2auv5PQbbCY
-=UZDf
------END PGP SIGNATURE-----
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/"
+}