Apply Fedora patches to keep this working (#517654 by Tiziano Müller)

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 59 insertions, 1 deletions

diff --git a/net-misc/networkmanager-openswan/ChangeLog b/net-misc/networkmanager-openswan/ChangeLog
index a38bca47e2f6..d2f21ad0616b 100644
--- a/net-misc/networkmanager-openswan/ChangeLog
+++ b/net-misc/networkmanager-openswan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/networkmanager-openswan
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openswan/ChangeLog,v 1.24 2014/06/24 01:26:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openswan/ChangeLog,v 1.25 2014/09/23 12:53:56 pacho Exp $
+
+*networkmanager-openswan-0.9.8.4-r1 (23 Sep 2014)
+
+  23 Sep 2014; Pacho Ramos <pacho@gentoo.org>
+  +networkmanager-openswan-0.9.8.4-r1.ebuild:
+  Apply Fedora patches to keep this working (#517654 by Tiziano Müller)
 
   24 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   networkmanager-openswan-0.9.8.4.ebuild:
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4-r1.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4-r1.ebuild
new file mode 100644
index 000000000000..42a2e607a916
--- /dev/null
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4-r1.ebuild,v 1.1 2014/09/23 12:53:56 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="NetworkManager Openswan plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-0.9.8:=
+	>=dev-libs/dbus-glib-0.74
+	|| ( net-misc/openswan net-misc/libreswan )
+	gtk? (
+		>=x11-libs/gtk+-3.0.0:3
+		gnome-base/gnome-keyring
+		gnome-base/libgnome-keyring
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Apply patches from Fedora, upstream bug #735692
+	epatch "${WORKDIR}/${P}-patches"/*.patch
+	echo "auth-dialog/nm-openswan-auth-dialog.desktop.in" >> po/POTFILES.in || die
+	echo "auth-dialog/nm-openswan-auth-dialog.desktop.in.in" >> po/POTFILES.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--with-gtkver=3 \
+		$(use_with gtk gnome)
+}