Clean up patch and rename it to include the version. Respect CC. Clean up ebuild.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/media-libs/libdlna/ChangeLog b/media-libs/libdlna/ChangeLog
index 412d2b8db97838942afc5d717f45ff5daaa320fe..72f5755ad58609062f974bcf18a5ac68248986e7 100644 (file)
--- a/media-libs/libdlna/ChangeLog
+++ b/media-libs/libdlna/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libdlna
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/ChangeLog,v 1.11 2014/08/10 21:08:39 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/ChangeLog,v 1.12 2015/02/16 19:03:10 jer Exp $
+
+  16 Feb 2015; Jeroen Roovers <jer@gentoo.org> libdlna-0.2.4.ebuild,
+  +files/libdlna-0.2.4-libav9.patch, -files/libdlna-libav9.patch:
+  Clean up patch and rename it to include the version. Respect CC. Clean up
+  ebuild.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> libdlna-0.2.4.ebuild:
   QA: drop trailing '.' from DESCRIPTION

diff --git a/media-libs/libdlna/Manifest b/media-libs/libdlna/Manifest
index d7c13020fa3e67389edd2c822769ddd10dfed6eb..98ac69e2eb8e740012dde5f6e6abacc556361c6f 100644 (file)
--- a/media-libs/libdlna/Manifest
+++ b/media-libs/libdlna/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libdlna-libav9.patch 434 SHA256 bf595743f4340b16fa5f57b7a92a259391524930ff3b40c2e3855b1fa75a4d80 SHA512 a6eeb9efa202f3f3b3fd970f85bae59c793fdd11750be5f5234a9f2f710e96c67934caf17339981bac649c1d54c8967f2877d9f6ac6a22a32d631068a22fcb86 WHIRLPOOL 1af3b274538d3af85f48871c0231bba132e1d33629abd424f6319cc6bc5f03aae177bd1daab5711ec136268820c49953c72d307a8396330edd8f255b07a943ea
+AUX libdlna-0.2.4-libav9.patch 259 SHA256 7d60c4dd1ab57ef63169b58c703b6d7bdf619f28805f1e402507d2694d6637fe SHA512 52aab4d308a437c1b83f90f2786d48010b41249166daf073c0740d55412885f8f2eec5c54d7accf4b93c40afc8ea1d7ca2c43c4b22513fe9c43c07d54e26d084 WHIRLPOOL acd9a58fdf829daaf313d8c79089719d5534076a5c51c03b25528020a8bd4f80df2ef0e88203275e9f90ab811b395c9961806cafa5d80645193817f2b8542d13
 DIST libdlna-0.2.4.tar.bz2 37579 SHA256 4b2787392ea5ff61c0056bbaa0bb00a2c83d595d20b5658741658cddd17678c5 SHA512 2d6185e0d7f9d449fe48e5e6c7331a46fb795794c6b8f229e730e47ae519e28d012a79227c2bb43d3a62442560e0d65c8a84ef48e714a99848b854495d6bf7e6 WHIRLPOOL c2977ca71891cd64b12342b6ceb509c7c03ddb3ae1cbda44c0517796e990c07c9306c7372fcd112d7f211d7f79ae476fe146eaf2197065d5aebf6ba7dc20fda9
-EBUILD libdlna-0.2.4.ebuild 1071 SHA256 8a1db45c3194a4d3bbec43241c12bbf5072273997f3371b69f085ec6e7a1d93e SHA512 cd10b687de2362b9a01938d2c69ea51a215c3ee10e75549373863bb57c259f8a7b0ec4f9e95b55d77e94c46a33ed7a53f96ba9956ae3142d2a68be81083c021d WHIRLPOOL ac68e205409f98456a4798a10140c1454ee1833c78650e4a7691bf4f86b127ed67bfa2e2733ccf28be27a20c11fefff2714488d9fe4bbb6c9081963dbc78faa0
-MISC ChangeLog 2032 SHA256 33fd1a90558c3632baeb3711b5a3b7e3dea952a8d46d1ba6280a6a91f82640b5 SHA512 1dcb667b84cb7fe7f8076c30e7f28dfa8ae9128a29b16a7f029878a43e1a937e0b6b374f446a672f924d129b1511ae9d05b3ee659153afa8fb3701d68569cb1d WHIRLPOOL 1ed18fa384e7884d2585f6cdfc4bcb075756048360f84eaf22aa302d38799590300cc408b7784c15b4e4d1674d49d52e5b07c0dbfd09b547b875b84429af5387
+EBUILD libdlna-0.2.4.ebuild 946 SHA256 8233155c362fd0ea456adaad9f3550b0be035178d5e5710234bb5892012a89dc SHA512 96594dcb299ef4cfeabc839407e35b4e606447ae0bee231d7d35f110b569bfd5257f329807ecf8e7d6a603c5b25adaf6c0424f955292619b284b04272260daf4 WHIRLPOOL 6abaddf934b0f1f5ce7781ce808a0bcb75d17828738b5cc9723d8e3c99cda4c2bbbf6011db31278b95ace1461a188190ab005b29a9318e279d24334e2ba6da6b
+MISC ChangeLog 2251 SHA256 0669874319defcd4e0e0795aed5c8de868a9463492696ab1a93915b381b4f1d8 SHA512 49d250674660684f4fa762b952d522d4de271261fb1f417221c02aa2191fbcbdc447bf9528867c7a5892519023e2d8c0d0596262c713bf6b62312c2b06698392 WHIRLPOOL 60dcc0f63300cdd3ce8afd1095c571272c5e3c4a73e2954849f0ccafdd2bf882074ca966f072c6cc0b606b152a1a996294be9b7539cab1fc1b15de8834745e25
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn31cACgkQcaHudmEf86qloQCfVq+ukMhV28worJ/hspiMqDNu
-pFUAn1dVXqF1+j+7hepp+kuusuk51yXZ
-=gRIS
+iEYEAREIAAYFAlTiPu8ACgkQVWmRsqeSphMAnACeOpzxtQexC8rM2tvklWJNEHGU
+oFwAoIAGP19o1h3eJvCtn3uEOgHM8tp5
+=mGNI
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libdlna/files/libdlna-libav9.patch b/media-libs/libdlna/files/libdlna-0.2.4-libav9.patch
similarity index 50%
rename from media-libs/libdlna/files/libdlna-libav9.patch
rename to media-libs/libdlna/files/libdlna-0.2.4-libav9.patch
index 4fdd688ce798a4f9e23f7fae6115d2ba270e6ced..7b6deb055e755a978429c139083cccb27732e3f6 100644 (file)
--- a/media-libs/libdlna/files/libdlna-libav9.patch
+++ b/media-libs/libdlna/files/libdlna-0.2.4-libav9.patch
@@ -1,6 +1,5 @@
-diff -burN libdlna-0.2.4.orig/src/profiles.c libdlna-0.2.4/src/profiles.c
---- libdlna-0.2.4.orig/src/profiles.c  2012-02-26 20:34:00.000000000 +0100
-+++ libdlna-0.2.4/src/profiles.c       2013-04-21 15:11:17.158148687 +0200
+--- a/src/profiles.c
++++ b/src/profiles.c
 @@ -287,7 +287,7 @@
      return NULL;
    }

diff --git a/media-libs/libdlna/libdlna-0.2.4.ebuild b/media-libs/libdlna/libdlna-0.2.4.ebuild
index 6b0b7b2ec8be07853c3f02f0632459f8979afbe4..7aaf2c774f14f1ba9f1481f7f862d53f405b44d6 100644 (file)
--- a/media-libs/libdlna/libdlna-0.2.4.ebuild
+++ b/media-libs/libdlna/libdlna-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/libdlna-0.2.4.ebuild,v 1.6 2014/08/10 21:08:39 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/libdlna-0.2.4.ebuild,v 1.7 2015/02/16 19:03:10 jer Exp $
 
-EAPI=4
-inherit eutils multilib
+EAPI=5
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A reference open-source implementation of DLNA (Digital Living Network Alliance) standards"
 HOMEPAGE="http://libdlna.geexbox.org"
@@ -12,13 +12,14 @@ SRC_URI="http://libdlna.geexbox.org/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
 
 DEPEND=">=virtual/ffmpeg-0.6.90"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-       epatch "${FILESDIR}/${PN}-libav9.patch"
+       epatch "${FILESDIR}"/${P}-libav9.patch
+
+       tc-export CC
 }
 
 src_configure() {
@@ -28,15 +29,10 @@ src_configure() {
                --prefix="${EPREFIX}/usr" \
                --libdir="${EPREFIX}/usr/$(get_libdir)" \
                --disable-static \
-               || die "./configure failed"
+               || die
 }
 
 src_compile() {
        # not parallel safe, error "cannot find -ldlna"
        emake -j1
 }
-
-#src_install() {
-#      emake DESTDIR="${D}" install || die "emake install failed."
-#      dodoc README AUTHORS ChangeLog || die
-#}