aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven 'sleipnir' Rebhan <odinshorse@googlemail.com>2009-05-28 21:01:12 +0000
committerSven 'sleipnir' Rebhan <odinshorse@googlemail.com>2009-05-28 21:01:12 +0000
commit21300f26971cc20de68c40b9549f032f60dc421d (patch)
tree67af28181a41b7c0abcd81a344bc1e7a552095a7 /x11-libs
parentRemove libSM keyword file. (diff)
downloadembedded-cross-21300f26971cc20de68c40b9549f032f60dc421d.tar.gz
embedded-cross-21300f26971cc20de68c40b9549f032f60dc421d.tar.bz2
embedded-cross-21300f26971cc20de68c40b9549f032f60dc421d.zip
Portage's libX11-1.1.5 is stable and compiles fine, so no point in keeping this.
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/libX11/Manifest3
-rw-r--r--x11-libs/libX11/files/libX11-1.1.5-crosscompile-makekeys.patch64
-rw-r--r--x11-libs/libX11/libX11-1.1.5.ebuild33
3 files changed, 0 insertions, 100 deletions
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
deleted file mode 100644
index d4f90f4..0000000
--- a/x11-libs/libX11/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX libX11-1.1.5-crosscompile-makekeys.patch 1835 RMD160 acef866ac6cf25aff89cd68d77f85e97b8555670 SHA1 52b3587b8c2ad6ce2bdfe03b58375ea8ab94d5b9 SHA256 90c819163a29f978a18e42416893216e00d2a25eb8805b558a2e204c9fa5edab
-DIST libX11-1.1.5.tar.bz2 1585005 RMD160 78567a999640851e7daba1ab44603ec099d0b619 SHA1 b703cb7c97e5aa35bf04a8df798e128ae16cf0d0 SHA256 da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82
-EBUILD libX11-1.1.5.ebuild 1008 RMD160 0dc74e919b3906da0f64a1dda81c572a35718395 SHA1 bbef31c42089b7eaf65f8bd8efe4b39b8e92e63c SHA256 8329dc9efa9e5e7dd5c4b3b1e3790793095098b502d1be847a872e3830a06f5c
diff --git a/x11-libs/libX11/files/libX11-1.1.5-crosscompile-makekeys.patch b/x11-libs/libX11/files/libX11-1.1.5-crosscompile-makekeys.patch
deleted file mode 100644
index a6709b8..0000000
--- a/x11-libs/libX11/files/libX11-1.1.5-crosscompile-makekeys.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- configure.ac 2009-03-26 21:33:12.000000000 +0000
-+++ configure.ac.new 2009-03-26 21:33:06.000000000 +0000
-@@ -305,6 +305,19 @@
- fi
- AC_SUBST(XKBPROTO_REQUIRES)
-
-+AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
-+
-+AC_MSG_CHECKING([for CC_FOR_BUILD])
-+if test "x${CC_FOR_BUILD+set}" != "xset" ; then
-+ if test "x$cross_compiling" = "xyes" ; then
-+ CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-+ else
-+ CC_FOR_BUILD=${CC}
-+ fi
-+fi
-+AC_MSG_RESULT([$CC_FOR_BUILD])
-+AC_SUBST(CC_FOR_BUILD)
-+
- AC_FUNC_MMAP()
- composecache_default=$ac_cv_func_mmap_fixed_mapped
- AC_CHECK_FUNC(nl_langinfo, , [composecache_default=no])
-
---- src/Makefile.am 2009-03-26 21:33:18.000000000 +0000
-+++ src/Makefile.am.new 2009-03-26 21:32:56.000000000 +0000
-@@ -421,8 +421,14 @@
-
- KEYSYMDEF=@KEYSYMDEF@
-
-+if CROSS_COMPILING
-+MAKEKEYS=$(top_builddir)/src/util/xmakekeys
-+else
-+MAKEKEYS=$(top_builddir)/src/util/makekeys
-+endif
-+
- ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
-- $(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h
-+ $(MAKEKEYS) < $(KEYSYMDEF) > ks_tables_h
- mv ks_tables_h $@
-
- $(top_builddir)/src/util/makekeys$(EXEEXT): force
-
---- src/util/Makefile.am 2009-03-26 21:33:26.000000000 +0000
-+++ src/util/Makefile.am.new 2009-03-26 21:32:47.000000000 +0000
-@@ -1,11 +1,16 @@
- # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
-
--noinst_PROGRAMS=makekeys
-+noinst_PROGRAMS=makekeys$(EXEEXT) $(MAKEKEYS_PROG)
-
- makekeys_CFLAGS=$(X11_CFLAGS)
-
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+if CROSS_COMPILING
-+MAKEKEYS_PROG=xmakekeys$(EXEEXT)
-+
-+xmakekeys$(EXEEXT): makekeys.c
-+ $(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
-+ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c
-+endif
-
- EXTRA_DIST = mkks.sh
-
diff --git a/x11-libs/libX11/libX11-1.1.5.ebuild b/x11-libs/libX11/libX11-1.1.5.ebuild
deleted file mode 100644
index e6553eb..0000000
--- a/x11-libs/libX11/libX11-1.1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.1.5.ebuild,v 1.1 2008/09/06 06:56:34 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-PATCHES="${FILESDIR}/${P}-crosscompile-makekeys.patch"
-
-inherit x-modular toolchain-funcs flag-o-matic
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 xcb"
-RDEPEND=">=x11-libs/xtrans-1.0.1
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-proto/kbproto
- >=x11-proto/xproto-7.0.6
- xcb? ( >=x11-libs/libxcb-1.0 )"
-DEPEND=">=x11-libs/xtrans-1.0.1
- x11-proto/xf86bigfontproto
- x11-proto/bigreqsproto
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xcmiscproto
- >=x11-misc/util-macros-0.99.0_p20051007"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
- $(use_with xcb)"
-# xorg really doesn't like xlocale disabled.
-# $(use_enable nls xlocale)
-