x11-apps/xf86dga: remove useless deps on libXt, libXaw and libXmu (fixes bug #227895)

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 73 insertions, 5 deletions

diff --git a/x11-apps/xf86dga/ChangeLog b/x11-apps/xf86dga/ChangeLog
index c96c4387b34b..9d32cbb035ec 100644
--- a/x11-apps/xf86dga/ChangeLog
+++ b/x11-apps/xf86dga/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xf86dga
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/ChangeLog,v 1.27 2009/07/07 01:37:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/ChangeLog,v 1.28 2009/09/24 07:39:44 remi Exp $
+
+  24 Sep 2009; Rémi Cardona <remi@gentoo.org> xf86dga-1.0.2.ebuild,
+  +files/xf86dga-1.0.2-fix-deps.patch:
+  remove useless deps on libXt, libXaw and libXmu (fixes bug #227895)
 
   07 Jul 2009; Jeroen Roovers <jer@gentoo.org> xf86dga-1.0.2.ebuild:
   Stable for HPPA too.
diff --git a/x11-apps/xf86dga/Manifest b/x11-apps/xf86dga/Manifest
index 56351b0f0e59..5270580799d2 100644
--- a/x11-apps/xf86dga/Manifest
+++ b/x11-apps/xf86dga/Manifest
@@ -1,4 +1,5 @@
+AUX xf86dga-1.0.2-fix-deps.patch 1522 RMD160 ef08e4e8383804f52d691485e1197d8159415699 SHA1 b475e0620d12261866467e6afb215a73fd00a6e3 SHA256 bc4ca47be47ce735c31f8a04bd4cbbac60ad7b6ab17f97b13fe2e13cd3486a80
 DIST xf86dga-1.0.2.tar.bz2 80170 RMD160 8180ea966f33a4b1d97916fba55f29916f85d29b SHA1 14a5d8eb29736a66876d68fe4643bf9b6dd0a6a7 SHA256 650633b83796e5a24d4c5ec30adfeb3958f75d9d0785060d5c42bab55ccc1857
-EBUILD xf86dga-1.0.2.ebuild 543 RMD160 8a9694f3619e8cf83c52b7358bccb8b30cb21f4d SHA1 2a78e25591638948ce4f9e656496d0e9543124ee SHA256 c53af7e1d9dad2e94742660b8f7b2c83acc041cb52fdc0e10a21f94c87ea2f89
-MISC ChangeLog 3673 RMD160 d01cf8a60d7adcac5a5bb255457e6495db244224 SHA1 fc32c04c4d1e94ba861c404b188e183561cbae82 SHA256 c10504a6de5db6eb2565703de3fa920cc0d52dfae6efad0b2a085c0e85fbcb65
+EBUILD xf86dga-1.0.2.ebuild 601 RMD160 55368d5353f76103b20f1c25cc96def89c36689f SHA1 e485c95aba2648f3b77fc7e6b6bc8b4c4b93b75b SHA256 f4910e3f5a5d5aacd117f11ef6e35aa223dd4634c962a927b9e195bf3acab369
+MISC ChangeLog 3853 RMD160 65161b2ca382d99dca4ef435b1fe4b9e9d89e558 SHA1 0b3f93050d29b9481b1618ca1477bf570f7882e4 SHA256 cc47a967904471b1a952fba619993a624395bcff801b799f2059e934b7ea3001
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-apps/xf86dga/files/xf86dga-1.0.2-fix-deps.patch b/x11-apps/xf86dga/files/xf86dga-1.0.2-fix-deps.patch
new file mode 100644
index 000000000000..8f5339d14a3e
--- /dev/null
+++ b/x11-apps/xf86dga/files/xf86dga-1.0.2-fix-deps.patch
@@ -0,0 +1,59 @@
+From 4e4c9f023d84e37de412f1f484615edca6628549 Mon Sep 17 00:00:00 2001
+From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Sun, 16 Mar 2008 23:33:57 +0000
+Subject: xf86dga doesn't require Xt, Xmu and Xaw.
+
+  Remove inclusion of Xt/Xmu/Xaw headers and update includes to match
+missing libc and libX11 protypes.
+---
+diff --git a/configure.ac b/configure.ac
+index c9113c4..ad6543c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,7 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ 
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XF86DGA, x11 xxf86dga xt xaw7 xmu)
++PKG_CHECK_MODULES(XF86DGA, x11 xxf86dga)
+ AC_SUBST(XF86DGA_CFLAGS)
+ AC_SUBST(XF86DGA_LIBS)
+ 
+diff --git a/dga.c b/dga.c
+index 7305ecd..eb1ec6e 100644
+--- a/dga.c
++++ b/dga.c
+@@ -1,26 +1,16 @@
+ /* $XFree86: xc/programs/xf86dga/dga.c,v 3.19 2001/10/28 03:34:32 tsi Exp $ */
+ 
+-#include <X11/Xos.h>
+-#include <X11/Intrinsic.h>
+-#include <X11/Shell.h>
+-#include <X11/StringDefs.h>
+-#include <X11/Xatom.h>
+-#include <X11/Xaw/Form.h>
+-#include <X11/Xaw/Scrollbar.h>
+-#include <X11/Xaw/Label.h>
+-#include <X11/Xaw/Command.h>
+-#include <X11/Xaw/AsciiText.h>
+-#include <X11/Xaw/Box.h>
+-#include <X11/Xaw/Toggle.h>
+-#include <X11/Xmu/StdSel.h>
+-#include <X11/Xmd.h>
++#include <X11/Xlib.h>
++#include <X11/Xutil.h>
+ #include <X11/extensions/xf86dga.h>
++#include <sys/time.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <signal.h>
+-
++#include <unistd.h>
+ 
+ 
+ #define MINMAJOR 0
+--
+cgit v0.8.2
diff --git a/x11-apps/xf86dga/xf86dga-1.0.2.ebuild b/x11-apps/xf86dga/xf86dga-1.0.2.ebuild
index 85918d3abcd0..8c9467037d09 100644
--- a/x11-apps/xf86dga/xf86dga-1.0.2.ebuild
+++ b/x11-apps/xf86dga/xf86dga-1.0.2.ebuild
@@ -1,16 +1,20 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/xf86dga-1.0.2.ebuild,v 1.13 2009/07/07 01:37:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/xf86dga-1.0.2.ebuild,v 1.14 2009/09/24 07:39:44 remi Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular
 
 DESCRIPTION="test program for the XFree86-DGA extension"
+
 KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd"
 IUSE=""
+
 RDEPEND="x11-libs/libX11
 	x11-libs/libXxf86dga"
 DEPEND="${RDEPEND}
 	x11-proto/xf86dgaproto"
+
+PATCHES=( "${FILESDIR}/xf86dga-1.0.2-fix-deps.patch" )