Remove XTrap (app, lib & proto) as removed from X11R7.5

Signed-off-by: Will Wagner <will_wagner@carallon.com>
Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

8 files changed, 2 insertions, 68 deletions

diff --git a/CHANGES b/CHANGES
index bc9315e83..0a3314f03 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,8 @@
 	xlib_libpciaccess, xproto_dri2proto, xproto_eviext,
 	xproto_fontcacheproto, xproto_xf86miscproto, xserver_xorg-server
 
+	Removed packages: xapp_xtrap, xlib_libXTrap, xproto_trapproto
+
 	Issues resolved (http://bugs.uclibc.org):
 
 	#513: Add new squid package
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index a33371843..9c43aca38 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -50,7 +50,6 @@ endmenu
 		source package/x11r7/xlib_libSM/Config.in
 		source package/x11r7/xlib_libX11/Config.in
 		source package/x11r7/xlib_libXScrnSaver/Config.in
-		source package/x11r7/xlib_libXTrap/Config.in
 		source package/x11r7/xlib_libXau/Config.in
 		source package/x11r7/xlib_libXaw/Config.in
 		source package/x11r7/xlib_libXcomposite/Config.in
@@ -169,7 +168,6 @@ endmenu
 		source package/x11r7/xapp_xsetroot/Config.in
 		source package/x11r7/xapp_xsm/Config.in
 		source package/x11r7/xapp_xstdcmap/Config.in
-		source package/x11r7/xapp_xtrap/Config.in
 		source package/x11r7/xapp_xvidtune/Config.in
 		source package/x11r7/xapp_xvinfo/Config.in
 		source package/x11r7/xapp_xwd/Config.in
@@ -295,7 +293,6 @@ endmenu
 		source package/x11r7/xproto_renderproto/Config.in
 		source package/x11r7/xproto_resourceproto/Config.in
 		source package/x11r7/xproto_scrnsaverproto/Config.in
-		source package/x11r7/xproto_trapproto/Config.in
 		source package/x11r7/xproto_videoproto/Config.in
 		source package/x11r7/xproto_windowswmproto/Config.in
 		source package/x11r7/xproto_xcmiscproto/Config.in
diff --git a/package/x11r7/xapp_xtrap/Config.in b/package/x11r7/xapp_xtrap/Config.in
deleted file mode 100644
index 55cb418e1..000000000
--- a/package/x11r7/xapp_xtrap/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_XAPP_XTRAP
-	bool "xtrap"
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXTRAP
-	help
-	  xtrap 1.0.2
-	  X.Org xtrap application
diff --git a/package/x11r7/xapp_xtrap/xapp_xtrap.mk b/package/x11r7/xapp_xtrap/xapp_xtrap.mk
deleted file mode 100644
index a31279b18..000000000
--- a/package/x11r7/xapp_xtrap/xapp_xtrap.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xapp_xtrap -- X.Org xtrap application
-#
-################################################################################
-
-XAPP_XTRAP_VERSION = 1.0.2
-XAPP_XTRAP_SOURCE = xtrap-$(XAPP_XTRAP_VERSION).tar.bz2
-XAPP_XTRAP_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XTRAP_AUTORECONF = NO
-XAPP_XTRAP_DEPENDENCIES = xlib_libX11 xlib_libXTrap
-
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xtrap))
diff --git a/package/x11r7/xlib_libXTrap/Config.in b/package/x11r7/xlib_libXTrap/Config.in
deleted file mode 100644
index 72ecf5bff..000000000
--- a/package/x11r7/xlib_libXTrap/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBXTRAP
-	bool "libXTrap"
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXT
-	select BR2_PACKAGE_XLIB_LIBXEXT
-	select BR2_PACKAGE_XPROTO_TRAPPROTO
-	help
-	  libXTrap 1.0.0
-	  X.Org XTrap library
diff --git a/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk b/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
deleted file mode 100644
index 5b7982a67..000000000
--- a/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xlib_libXTrap -- X.Org XTrap library
-#
-################################################################################
-
-XLIB_LIBXTRAP_VERSION = 1.0.0
-XLIB_LIBXTRAP_SOURCE = libXTrap-$(XLIB_LIBXTRAP_VERSION).tar.bz2
-XLIB_LIBXTRAP_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXTRAP_AUTORECONF = NO
-XLIB_LIBXTRAP_INSTALL_STAGING = YES
-XLIB_LIBXTRAP_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXext xproto_trapproto
-XLIB_LIBXTRAP_CONF_OPT = --enable-shared --disable-static
-
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXTrap))
diff --git a/package/x11r7/xproto_trapproto/Config.in b/package/x11r7/xproto_trapproto/Config.in
deleted file mode 100644
index 0f9c4708e..000000000
--- a/package/x11r7/xproto_trapproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_XPROTO_TRAPPROTO
-	bool "trapproto"
-	select BR2_PACKAGE_XLIB_LIBXT
-	help
-	  trapproto 3.4.3
-	  X.Org Trap protocol headers
diff --git a/package/x11r7/xproto_trapproto/xproto_trapproto.mk b/package/x11r7/xproto_trapproto/xproto_trapproto.mk
deleted file mode 100644
index 29c435607..000000000
--- a/package/x11r7/xproto_trapproto/xproto_trapproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_trapproto -- X.Org Trap protocol headers
-#
-################################################################################
-
-XPROTO_TRAPPROTO_VERSION = 3.4.3
-XPROTO_TRAPPROTO_SOURCE = trapproto-$(XPROTO_TRAPPROTO_VERSION).tar.bz2
-XPROTO_TRAPPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_TRAPPROTO_AUTORECONF = NO
-XPROTO_TRAPPROTO_INSTALL_STAGING = YES
-XPROTO_TRAPPROTO_INSTALL_TARGET = NO
-XPROTO_TRAPPROTO_DEPENDENCIES = xlib_libXt
-
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_trapproto))