Add missing dependency on docbook-xml-dtd, bug 392707. Consolidate X-related use flags, and don't enable alsa cups, and X by default.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

5 files changed, 51 insertions, 37 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index 123b47ddd7cb..1bafc6042033 100644
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/freerdp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.16 2011/12/04 04:20:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.17 2011/12/04 05:10:47 floppym Exp $
+
+  04 Dec 2011; Mike Gilbert <floppym@gentoo.org> freerdp-1.0_beta1.ebuild,
+  freerdp-1.0_beta2.ebuild, freerdp-9999.1.ebuild, metadata.xml:
+  Add missing dependency on docbook-xml-dtd, bug 392707. Consolidate X-related
+  use flags, and don't enable alsa cups, and X by default.
 
   04 Dec 2011; Mike Gilbert <floppym@gentoo.org> metadata.xml:
   Reorder maintainers.
diff --git a/net-misc/freerdp/freerdp-1.0_beta1.ebuild b/net-misc/freerdp/freerdp-1.0_beta1.ebuild
index 8cfa042fb476..3703ffc548f2 100644
--- a/net-misc/freerdp/freerdp-1.0_beta1.ebuild
+++ b/net-misc/freerdp/freerdp-1.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.0_beta1.ebuild,v 1.3 2011/11/14 19:09:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.0_beta1.ebuild,v 1.4 2011/12/04 05:10:47 floppym Exp $
 
 EAPI="4"
 
@@ -13,8 +13,7 @@ SRC_URI="https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-${PV/_/-}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+alsa +cups directfb ffmpeg pulseaudio smartcard sse2 test +X +xcursor
-	+xext +xinerama +xkbfile +xv"
+IUSE="alsa cups directfb doc ffmpeg pulseaudio smartcard sse2 test X xinerama xv"
 
 FREERDP_DEBUG="transport chanman svc dvc kbd nla nego certificate license gdi
 	rfx x11 rail xv scard orders redir"
@@ -31,15 +30,20 @@ RDEPEND="
 	smartcard? ( sys-apps/pcsc-lite )
 	X? (
 		x11-libs/libX11
-		xcursor? ( x11-libs/libXcursor )
-		xext? ( x11-libs/libXext )
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libxkbfile
 		xinerama? ( x11-libs/libXinerama )
 		xv? ( x11-libs/libXv )
 	)
-	xkbfile? ( x11-libs/libxkbfile )
 "
 DEPEND="${RDEPEND}
-	app-text/xmlto
+	doc? (
+		X? (
+			app-text/docbook-xml-dtd:4.1.2
+			app-text/xmlto
+		)
+	)
 	test? ( dev-util/cunit )
 "
 
@@ -57,9 +61,9 @@ CMAKE_VERBOSE=1
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_MANPAGES=ON
 		$(cmake-utils_use_with alsa ALSA)
 		$(cmake-utils_use_with cups CUPS)
+		$(cmake-utils_use_with doc MANPAGES)
 		$(cmake-utils_use_with directfb DIRECTFB)
 		$(cmake-utils_use_with ffmpeg FFMPEG)
 		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
@@ -67,10 +71,10 @@ src_configure() {
 		$(cmake-utils_use_with sse2 SSE2)
 		$(cmake-utils_use_with test CUNIT)
 		$(cmake-utils_use_with X X11)
-		$(cmake-utils_use_with xcursor XCURSOR)
-		$(cmake-utils_use_with xext XEXT)
+		$(cmake-utils_use_with X XCURSOR)
+		$(cmake-utils_use_with X XEXT)
+		$(cmake-utils_use_with X XKBFILE)
 		$(cmake-utils_use_with xinerama XINERAMA)
-		$(cmake-utils_use_with xkbfile XKBFILE)
 		$(cmake-utils_use_with xv XV)
 	)
 	for i in ${FREERDP_DEBUG}; do
diff --git a/net-misc/freerdp/freerdp-1.0_beta2.ebuild b/net-misc/freerdp/freerdp-1.0_beta2.ebuild
index 4f76701b2bc9..1104ddf5e44a 100644
--- a/net-misc/freerdp/freerdp-1.0_beta2.ebuild
+++ b/net-misc/freerdp/freerdp-1.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.0_beta2.ebuild,v 1.1 2011/11/28 03:08:41 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.0_beta2.ebuild,v 1.2 2011/12/04 05:10:47 floppym Exp $
 
 EAPI="4"
 
@@ -13,8 +13,7 @@ SRC_URI="https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-${PV/_beta2/-bete2
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+alsa +cups directfb ffmpeg pulseaudio smartcard sse2 test +X +xcursor
-	+xext +xinerama +xkbfile +xv"
+IUSE="alsa cups directfb doc ffmpeg pulseaudio smartcard sse2 test X xinerama xv"
 
 FREERDP_DEBUG="transport chanman svc dvc kbd nla nego certificate license gdi
 	rfx x11 rail xv scard orders redir"
@@ -31,15 +30,20 @@ RDEPEND="
 	smartcard? ( sys-apps/pcsc-lite )
 	X? (
 		x11-libs/libX11
-		xcursor? ( x11-libs/libXcursor )
-		xext? ( x11-libs/libXext )
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libxkbfile
 		xinerama? ( x11-libs/libXinerama )
 		xv? ( x11-libs/libXv )
 	)
-	xkbfile? ( x11-libs/libxkbfile )
 "
 DEPEND="${RDEPEND}
-	app-text/xmlto
+	doc? (
+		X? (
+			app-text/docbook-xml-dtd:4.1.2
+			app-text/xmlto
+		)
+	)
 	test? ( dev-util/cunit )
 "
 
@@ -57,9 +61,9 @@ CMAKE_VERBOSE=1
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_MANPAGES=ON
 		$(cmake-utils_use_with alsa ALSA)
 		$(cmake-utils_use_with cups CUPS)
+		$(cmake-utils_use_with doc MANPAGES)
 		$(cmake-utils_use_with directfb DIRECTFB)
 		$(cmake-utils_use_with ffmpeg FFMPEG)
 		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
@@ -67,10 +71,10 @@ src_configure() {
 		$(cmake-utils_use_with sse2 SSE2)
 		$(cmake-utils_use_with test CUNIT)
 		$(cmake-utils_use_with X X11)
-		$(cmake-utils_use_with xcursor XCURSOR)
-		$(cmake-utils_use_with xext XEXT)
+		$(cmake-utils_use_with X XCURSOR)
+		$(cmake-utils_use_with X XEXT)
+		$(cmake-utils_use_with X XKBFILE)
 		$(cmake-utils_use_with xinerama XINERAMA)
-		$(cmake-utils_use_with xkbfile XKBFILE)
 		$(cmake-utils_use_with xv XV)
 	)
 	for i in ${FREERDP_DEBUG}; do
diff --git a/net-misc/freerdp/freerdp-9999.1.ebuild b/net-misc/freerdp/freerdp-9999.1.ebuild
index 7566ce65db69..3dd868464937 100644
--- a/net-misc/freerdp/freerdp-9999.1.ebuild
+++ b/net-misc/freerdp/freerdp-9999.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.4 2011/11/14 03:35:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.5 2011/12/04 05:10:47 floppym Exp $
 
 EAPI="4"
 
@@ -15,8 +15,7 @@ EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+alsa +cups directfb ffmpeg pulseaudio smartcard sse2 test +X +xcursor
-	+xext +xinerama +xkbfile +xv"
+IUSE="alsa cups directfb doc ffmpeg pulseaudio smartcard sse2 test X xinerama xv"
 
 FREERDP_DEBUG="transport chanman svc dvc kbd nla nego certificate license gdi
 	rfx x11 rail xv scard orders redir"
@@ -33,15 +32,20 @@ RDEPEND="
 	smartcard? ( sys-apps/pcsc-lite )
 	X? (
 		x11-libs/libX11
-		xcursor? ( x11-libs/libXcursor )
-		xext? ( x11-libs/libXext )
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libxkbfile
 		xinerama? ( x11-libs/libXinerama )
 		xv? ( x11-libs/libXv )
 	)
-	xkbfile? ( x11-libs/libxkbfile )
 "
 DEPEND="${RDEPEND}
-	app-text/xmlto
+	doc? (
+		X? (
+			app-text/docbook-xml-dtd:4.1.2
+			app-text/xmlto
+		)
+	)
 	test? ( dev-util/cunit )
 "
 
@@ -54,9 +58,9 @@ CMAKE_VERBOSE=1
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_MANPAGES=ON
 		$(cmake-utils_use_with alsa ALSA)
 		$(cmake-utils_use_with cups CUPS)
+		$(cmake-utils_use_with doc MANPAGES)
 		$(cmake-utils_use_with directfb DIRECTFB)
 		$(cmake-utils_use_with ffmpeg FFMPEG)
 		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
@@ -64,10 +68,10 @@ src_configure() {
 		$(cmake-utils_use_with sse2 SSE2)
 		$(cmake-utils_use_with test CUNIT)
 		$(cmake-utils_use_with X X11)
-		$(cmake-utils_use_with xcursor XCURSOR)
-		$(cmake-utils_use_with xext XEXT)
+		$(cmake-utils_use_with X XCURSOR)
+		$(cmake-utils_use_with X XEXT)
+		$(cmake-utils_use_with X XKBFILE)
 		$(cmake-utils_use_with xinerama XINERAMA)
-		$(cmake-utils_use_with xkbfile XKBFILE)
 		$(cmake-utils_use_with xv XV)
 	)
 	for i in ${FREERDP_DEBUG}; do
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index 894bbe556e13..ae6f8872da88 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -38,8 +38,5 @@
 	<flag name="nss">Use NSS as crypto backend</flag>
 	<flag name="polarssl">Use PolarSSL as crypto backend</flag>
 	<flag name="ssl">Use OpenSSL as crypto backend</flag>
-	<flag name="xcursor">Use the XCursor library</flag>
-	<flag name="xext">Use the Xext library</flag>
-	<flag name="xkbfile">Use the xkbfile library</flag>
 </use>
 </pkgmetadata>