[patch] patch of freerdp-2.0.0_pre20160610.ebuild against freerdp-1.2.1_pre20160610 (the ebuilds that fix hopefully everything)

ebuild-fixes.gbug.patch (text/plain), 9.64 KB, created by Johannes Rosenberger on 2016-06-12 14:13:48 UTC

From 3ffddb7a82b8af8df09b936fc35eb0f4ecec68e9 Mon Sep 17 00:00:00 2001
From: Johannes Rosenberger <[e-mail]>
Date: Sat, 11 Jun 2016 11:08:29 +0200
Subject: [PATCH 2/4] Fixed small incorrectness net-misc/freerdp ebuild.

Added ebuild_musl to IUSE.
---
 net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild
index 7d373f8..3bdf2f2 100644
--- a/net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild
@@ -22,7 +22,8 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/1.2"
-IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl
+	neon pulseaudio server smartcard systemd test usb wayland X xinerama xv elibc_musl"
 
 RDEPEND="
 	elibc_musl? ( dev-libs/libbsd )
-- 
2.7.3

From 9bb51d6a9347338ad00784035eb6548b0481271c Mon Sep 17 00:00:00 2001
From: Johannes Rosenberger <[e-mail]>
Date: Sat, 11 Jun 2016 18:45:51 +0200
Subject: [PATCH 4/4] net-misc/freerdp: Corrected ebuild version.

* Changed version number in patch and ebuild from 1.2.1 to 2.0.0.
* Updated patch file name in ebuild.

---
# net-misc/freerdp/Manifest                          |   7 +- (removed diff)
 .../freerdp/files/1.2.1_pre20160610-musl.patch     |  11 --
 .../freerdp/files/2.0.0_pre20160610-musl.patch     |  11 ++
 net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild  | 115 ---------------------
 net-misc/freerdp/freerdp-2.0.0_pre20160610.ebuild  | 115 +++++++++++++++++++++
 5 files changed, 130 insertions(+), 129 deletions(-)
 delete mode 100644 net-misc/freerdp/files/1.2.1_pre20160610-musl.patch
 create mode 100644 net-misc/freerdp/files/2.0.0_pre20160610-musl.patch
 delete mode 100644 net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild
 create mode 100644 net-misc/freerdp/freerdp-2.0.0_pre20160610.ebuild


### Removed the diff of the Manifest ###


diff --git a/net-misc/freerdp/files/1.2.1_pre20160610-musl.patch b/net-misc/freerdp/files/1.2.1_pre20160610-musl.patch
deleted file mode 100644
index 779ed4a..0000000
--- a/net-misc/freerdp/files/1.2.1_pre20160610-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/winpr/libwinpr/comm/comm_serial_sys.c
-+++ b/winpr/libwinpr/comm/comm_serial_sys.c
-@@ -42,6 +42,9 @@
- #define TTY_THRESHOLD_UNTHROTTLE 	128
- #define N_TTY_BUF_SIZE			4096
- 
-+#ifndef CMSPAR
-+#define CMSPAR   010000000000
-+#endif
- 
- #define _BAUD_TABLE_END	0010020	/* __MAX_BAUD + 1 */
diff --git a/net-misc/freerdp/files/2.0.0_pre20160610-musl.patch b/net-misc/freerdp/files/2.0.0_pre20160610-musl.patch
new file mode 100644
index 0000000..779ed4a
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0_pre20160610-musl.patch
@@ -0,0 +1,11 @@
+--- a/winpr/libwinpr/comm/comm_serial_sys.c
++++ b/winpr/libwinpr/comm/comm_serial_sys.c
+@@ -42,6 +42,9 @@
+ #define TTY_THRESHOLD_UNTHROTTLE 	128
+ #define N_TTY_BUF_SIZE			4096
+ 
++#ifndef CMSPAR
++#define CMSPAR   010000000000
++#endif
+ 
+ #define _BAUD_TABLE_END	0010020	/* __MAX_BAUD + 1 */
diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild
deleted file mode 100644
index 3bdf2f2..0000000
--- a/net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils vcs-snapshot
-
-if [[ ${PV} != 9999* ]]; then
-	COMMIT="f818bab4b6a372117273c2fc06d561552d71874d"
-	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
-else
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
-		https://github.com/FreeRDP/FreeRDP.git"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/1.2"
-IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl
-	neon pulseaudio server smartcard systemd test usb wayland X xinerama xv elibc_musl"
-
-RDEPEND="
-	elibc_musl? ( dev-libs/libbsd )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	client? (
-		usb? (
-			virtual/libudev:0=
-			sys-apps/util-linux:0=
-			dev-libs/dbus-glib:0=
-			virtual/libusb:1=
-		)
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( virtual/jpeg:0 )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? ( dev-libs/wayland )
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	client? ( X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) ) )
-"
-
-DOCS=( README )
-
-if use elibc_musl; then
-	CFLAGS="${CFLAGS} -idirafter /usr/include/bsd"
-	PATCHES=( "${FILESDIR}/1.2.1_pre20160610-musl.patch" )
-fi
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with alsa ALSA)
-		$(cmake-utils_use_with client CLIENT)
-		$(cmake-utils_use_with cups CUPS)
-		$(cmake-utils_use_with debug DEBUG_ALL)
-		$(cmake-utils_use_with doc MANPAGES)
-		$(cmake-utils_use_with ffmpeg FFMPEG)
-		$(cmake-utils_use_with gstreamer GSTREAMER_1_0)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with neon NEON)
-		$(cmake-utils_use_with pulseaudio PULSE)
-		$(cmake-utils_use_with server SERVER)
-		$(cmake-utils_use_with smartcard PCSC)
-		$(cmake-utils_use_with systemd LIBSYSTEMD)
-		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
-		$(cmake-utils_use usb CHANNEL_URBDRC)
-		$(cmake-utils_use_with X X11)
-		$(cmake-utils_use_with xinerama XINERAMA)
-		$(cmake-utils_use_with xv XV)
-		$(cmake-utils_use_build test TESTING)
-		$(cmake-utils_use_with wayland WAYLAND)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/freerdp/freerdp-2.0.0_pre20160610.ebuild b/net-misc/freerdp/freerdp-2.0.0_pre20160610.ebuild
new file mode 100644
index 0000000..1561e18
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.0.0_pre20160610.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils vcs-snapshot
+
+if [[ ${PV} != 9999* ]]; then
+	COMMIT="f818bab4b6a372117273c2fc06d561552d71874d"
+	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+else
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
+		https://github.com/FreeRDP/FreeRDP.git"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl
+	neon pulseaudio server smartcard systemd test usb wayland X xinerama xv elibc_musl"
+
+RDEPEND="
+	elibc_musl? ( dev-libs/libbsd )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	client? (
+		usb? (
+			virtual/libudev:0=
+			sys-apps/util-linux:0=
+			dev-libs/dbus-glib:0=
+			virtual/libusb:1=
+		)
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
+"
+
+DOCS=( README )
+
+if use elibc_musl; then
+	CFLAGS="${CFLAGS} -idirafter /usr/include/bsd"
+	PATCHES=( "${FILESDIR}/2.0.0_pre20160610-musl.patch" )
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with alsa ALSA)
+		$(cmake-utils_use_with client CLIENT)
+		$(cmake-utils_use_with cups CUPS)
+		$(cmake-utils_use_with debug DEBUG_ALL)
+		$(cmake-utils_use_with doc MANPAGES)
+		$(cmake-utils_use_with ffmpeg FFMPEG)
+		$(cmake-utils_use_with gstreamer GSTREAMER_1_0)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with neon NEON)
+		$(cmake-utils_use_with pulseaudio PULSE)
+		$(cmake-utils_use_with server SERVER)
+		$(cmake-utils_use_with smartcard PCSC)
+		$(cmake-utils_use_with systemd LIBSYSTEMD)
+		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
+		$(cmake-utils_use usb CHANNEL_URBDRC)
+		$(cmake-utils_use_with X X11)
+		$(cmake-utils_use_with xinerama XINERAMA)
+		$(cmake-utils_use_with xv XV)
+		$(cmake-utils_use_build test TESTING)
+		$(cmake-utils_use_with wayland WAYLAND)
+	)
+	cmake-utils_src_configure
+}
-- 
2.7.3