[gentoo-commits] proj/x11:master commit in: x11-libs/libXinerama/, x11-misc/xkeyboard-config/, ...

[Chi-Thanh Christopher Nguyen]

commit:     3e80cd9ffa08dcc2cc874da0890af4e8db4ee4e6
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 03:44:24 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sat Jun  1 03:44:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3e80cd9f

x11-drivers/xf86-video-displaylink: obsolete, use xf86-video-modesetting instead.

---
 .../xf86-video-displaylink-0.3-xorg-abi-fix.patch  | 25 ----------------------
 .../xf86-video-displaylink-0.3.ebuild              | 19 ----------------
 x11-libs/libXcursor/libXcursor-9999.ebuild         |  2 +-
 x11-libs/libXfixes/libXfixes-9999.ebuild           |  2 +-
 x11-libs/libXinerama/libXinerama-9999.ebuild       |  2 +-
 x11-libs/libXp/libXp-9999.ebuild                   |  2 +-
 x11-libs/libXt/libXt-9999.ebuild                   |  2 +-
 x11-libs/libXtst/libXtst-9999.ebuild               |  5 +++--
 x11-libs/libXxf86vm/libXxf86vm-9999.ebuild         |  2 +-
 .../xkeyboard-config/xkeyboard-config-9999.ebuild  |  4 ++--
 10 files changed, 11 insertions(+), 54 deletions(-)

diff --git a/x11-drivers/xf86-video-displaylink/files/xf86-video-displaylink-0.3-xorg-abi-fix.patch b/x11-drivers/xf86-video-displaylink/files/xf86-video-displaylink-0.3-xorg-abi-fix.patch
deleted file mode 100644
index df8e1db..0000000
--- a/x11-drivers/xf86-video-displaylink/files/xf86-video-displaylink-0.3-xorg-abi-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- orig/src/displaylink.c	2009-06-10 16:38:15.000000000 +0200
-+++ new/src/displaylink.c	2009-12-23 20:06:18.000000000 +0100
-@@ -46,8 +46,10 @@
- 
- #include "fb.h"
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86Resources.h"
- #include "xf86RAC.h"
-+#endif
- 
- #include "fbdevhw.h"
- 
-@@ -282,9 +284,11 @@
- 
- 	fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- 	pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
- 	/* XXX Is this right?  Can probably remove RAC_FB */
- 	pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-+#endif
- 
- 	/* open device */
- 	if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev")))

diff --git a/x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild b/x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild
deleted file mode 100644
index 0a46255..0000000
--- a/x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="xf86 displaylink driver"
-HOMEPAGE="http://libdlo.freedesktop.org/wiki/xf86-driver-displaylink"
-SRC_URI="http://projects.unbit.it/downloads/udlfb-0.2.3_and_${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${P}-xorg-abi-fix.patch" )

diff --git a/x11-libs/libXcursor/libXcursor-9999.ebuild b/x11-libs/libXcursor/libXcursor-9999.ebuild
index 7395b01..1572eae 100644
--- a/x11-libs/libXcursor/libXcursor-9999.ebuild
+++ b/x11-libs/libXcursor/libXcursor-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xcursor library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrender-0.8.2[${MULTILIB_USEDEP}]

diff --git a/x11-libs/libXfixes/libXfixes-9999.ebuild b/x11-libs/libXfixes/libXfixes-9999.ebuild
index 22954e8..4ccb3f9 100644
--- a/x11-libs/libXfixes/libXfixes-9999.ebuild
+++ b/x11-libs/libXfixes/libXfixes-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfixes library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]

diff --git a/x11-libs/libXinerama/libXinerama-9999.ebuild b/x11-libs/libXinerama/libXinerama-9999.ebuild
index e83db6c..bb8ee2e 100644
--- a/x11-libs/libXinerama/libXinerama-9999.ebuild
+++ b/x11-libs/libXinerama/libXinerama-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]

diff --git a/x11-libs/libXp/libXp-9999.ebuild b/x11-libs/libXp/libXp-9999.ebuild
index e0202a7..1116b24 100644
--- a/x11-libs/libXp/libXp-9999.ebuild
+++ b/x11-libs/libXp/libXp-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xp library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]

diff --git a/x11-libs/libXt/libXt-9999.ebuild b/x11-libs/libXt/libXt-9999.ebuild
index b4e41d5..f02dfe2 100644
--- a/x11-libs/libXt/libXt-9999.ebuild
+++ b/x11-libs/libXt/libXt-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org Xt library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]

diff --git a/x11-libs/libXtst/libXtst-9999.ebuild b/x11-libs/libXtst/libXtst-9999.ebuild
index 12a78e9..67bfb57 100644
--- a/x11-libs/libXtst/libXtst-9999.ebuild
+++ b/x11-libs/libXtst/libXtst-9999.ebuild
@@ -4,17 +4,18 @@
 
 EAPI=5
 
+XORG_DOC="doc"
 XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xtst library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.0.99.4[${MULTILIB_USEDEP}]
-	  x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
 	>=x11-proto/recordproto-1.13.99.1[${MULTILIB_USEDEP}]
 	>=x11-proto/xextproto-7.0.99.3[${MULTILIB_USEDEP}]
 	x11-proto/inputproto[${MULTILIB_USEDEP}]"

diff --git a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
index 7814bb3..7737dfb 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 7de7ca3..f799a4f 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -11,9 +11,9 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
 
 DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2"
+[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 LICENSE="MIT"