Fixed for and marked ~ppc-macos and ~x86-macos, bug #343611

Package-Manager: portage-2.2.01.17168-prefix/cvs/Darwin powerpc

4 files changed, 34 insertions, 15 deletions

diff --git a/net-libs/libnice/ChangeLog b/net-libs/libnice/ChangeLog
index 54e91617d032..71842940f24f 100644
--- a/net-libs/libnice/ChangeLog
+++ b/net-libs/libnice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libnice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/ChangeLog,v 1.16 2010/09/29 11:48:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/ChangeLog,v 1.17 2010/11/13 21:21:13 grobian Exp $
+
+  13 Nov 2010; Fabian Groffen <grobian@gentoo.org> libnice-0.0.13.ebuild,
+  +files/libnice-0.0.13-darwin.patch:
+  Fixed for and marked ~ppc-macos and ~x86-macos, bug #343611
 
 *libnice-0.0.13 (29 Sep 2010)
 
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index bd6d4a5c302a..f24422160415 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libnice-0.0.13-darwin.patch 613 RMD160 98f40a5026c9f5777aea4572849c5dec20475e23 SHA1 843d813cdabf9364bf463da948817d58e33ed6b7 SHA256 0999f74c5dcc45b0407b186a47a2d467b953d63c36b538d2594542a8eb1d847c
 DIST libnice-0.0.10.tar.gz 639213 RMD160 c62ff414bff522bd46c16a485f9b072879f6e287 SHA1 1d4add8eb11dccad01a5cb3891a8156a592f973b SHA256 86b68833965b9c4be6fd2ed7d06e131b6f5ee700c60de4ff431cc663a6d72713
 DIST libnice-0.0.13.tar.gz 635783 RMD160 0a20d03c4ed0fb1677149b2d9595a6111e958a15 SHA1 703b03fbb20da693c057d3fe5074b182a17c7364 SHA256 d8dd260c486a470a6052a5323920878a084e44a19df09b15728b85c9e3d6edf0
 DIST libnice-0.0.9.tar.gz 627674 RMD160 4b8f7e7f72dffa5af2d4ba251a18f8ab022d4d48 SHA1 821cbeeb972874855724d8a9cfbaaa3086f62881 SHA256 fa8652c422bf8b46eedb349ed4fdc5545dce104f9bd6c261a68ead6da9ff28a1
 EBUILD libnice-0.0.10.ebuild 951 RMD160 41b57652bf4ea7ff9a838f698b346fa35a653b60 SHA1 5514917cac50be2b09847199e4c50db72bf1d3d8 SHA256 ed1f3f80003dba4bd301bdd6545b46db9c82ac5d58c333e3239fbcb8bfe81466
-EBUILD libnice-0.0.13.ebuild 976 RMD160 0b7234cedee089c755316f54ec216f975444b953 SHA1 f498a565b0c38c467dd221aa31cd4b4fc3fe6087 SHA256 ae8572f8f3e6b1a6330bc17776874901282422be813f14479bf4f4d9bc6fcd09
+EBUILD libnice-0.0.13.ebuild 1121 RMD160 737f64352f85ae63d2a10fbe8c72af8ad1b26d05 SHA1 e2497eadcd061e2c2d9c9f3ec0d5cb07413811a2 SHA256 bd0d89e087ea3187e4dca395900631524ef7e9cbcc71665dc951c07d29bb96eb
 EBUILD libnice-0.0.9.ebuild 909 RMD160 e23bcec6a1b2290df16cc2c5c9eabe62cc7d39f3 SHA1 b9047832808ea280f92c5f50ecd420d0ba12c83c SHA256 f28919390b57e7ec027f3b6cd1843dce1f1e1c97f83d05755bcbe0005c80022b
-MISC ChangeLog 2143 RMD160 0c0ea5026f19d0f0ddaa9a4206779fed89f899ee SHA1 b830dc7a11ace9991a93e8f32b4cd065ef5c973e SHA256 3de7a6978485728cdd09c432466f9b1657c482ade896ff397678e0607425b8b8
+MISC ChangeLog 2320 RMD160 5a61921f341b76f4197139125539376ea58c87a5 SHA1 e9afad07a70ccba0bdfabde80f604dd266d97de4 SHA256 971cf0ef2736f5721ef4e17c6180d62a8f5c280068cbf82dcc879b9012f1f8af
 MISC metadata.xml 223 RMD160 607a8f759dcbca5ae6440c4d7dd411bf3b079d2a SHA1 04f62d5c162ddcb4edd04a9d001d64dbb0ce230e SHA256 6cab85bc4c69461cc60ebd279961a47dc01ccb63aa4f49e6f6bee0ad7c908a94
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyjJ5sACgkQCaWpQKGI+9SiAQCfV9+dRXzwV5mPE72Lf5e2/9At
-GCsAnAm361qmiWgGf5e6ef3xpdXqXXmy
-=LyBY
------END PGP SIGNATURE-----
diff --git a/net-libs/libnice/files/libnice-0.0.13-darwin.patch b/net-libs/libnice/files/libnice-0.0.13-darwin.patch
new file mode 100644
index 000000000000..901a6c047b22
--- /dev/null
+++ b/net-libs/libnice/files/libnice-0.0.13-darwin.patch
@@ -0,0 +1,17 @@
+http://trac.macports.org/browser/trunk/dports/net/libnice/files/patch-agent-interfaces.c.diff
+
+http://bugs.gentoo.org/show_bug.cgi?id=343611
+
+fix compilation error due to anonymous struct
+
+--- agent/interfaces.c
++++ agent/interfaces.c
+@@ -198,7 +198,7 @@
+       struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)ifa->ifa_addr;
+ 
+       /* Skip link-local addresses, they require a scope */
+-      if (IN6_IS_ADDR_LINKLOCAL (sa6->sin6_addr.s6_addr))
++      if (IN6_IS_ADDR_LINKLOCAL ((struct in6_addr *)sa6->sin6_addr.s6_addr))
+         continue;
+ 
+       if (inet_ntop (AF_INET6, &sa6->sin6_addr, addr_as_string,
diff --git a/net-libs/libnice/libnice-0.0.13.ebuild b/net-libs/libnice/libnice-0.0.13.ebuild
index 2ba1b825b44c..45ae886b06a7 100644
--- a/net-libs/libnice/libnice-0.0.13.ebuild
+++ b/net-libs/libnice/libnice-0.0.13.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/libnice-0.0.13.ebuild,v 1.1 2010/09/29 11:48:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/libnice-0.0.13.ebuild,v 1.2 2010/11/13 21:21:13 grobian Exp $
 
 EAPI="2"
 
+inherit eutils libtool
+
 DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
 HOMEPAGE="http://nice.freedesktop.org/wiki/"
 SRC_URI="http://nice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+gstreamer upnp"
 
 RDEPEND=">=dev-libs/glib-2.10
@@ -21,6 +23,11 @@ RDEPEND=">=dev-libs/glib-2.10
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-darwin.patch
+	elibtoolize  # for .bundle on Darwin
+}
+
 src_configure() {
 	econf $(use_with gstreamer) $(use_enable upnp gupnp)
 }