[gentoo-commits] proj/x11:master commit in: x11-libs/libXft/files/, x11-libs/libXft/, x11-proto/glproto/

[gentoo-commits] proj/x11:master commit in: x11-libs/libXft/files/, x11-libs/libXft/, x11-proto/glproto/

[Chi-Thanh Christopher Nguyen]

commit:     2d716dba5fb5445bdd49debdb116da84a70b5595
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 18:56:25 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Dec 15 18:56:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2d716dba

Remove package versions that are in portage now.

---
 .../libXft/files/libXft-2.3.1-compile_fix.patch    | 17 ---------
 x11-libs/libXft/libXft-2.3.1-r1.ebuild             | 24 -------------
 x11-proto/glproto/glproto-1.4.17.ebuild            | 41 ----------------------
 3 files changed, 82 deletions(-)

diff --git a/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch b/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch
deleted file mode 100644
index 4fc944a..0000000
--- a/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/xftglyphs.c.orig	2012-06-02 11:36:35.000000000 -0500
-+++ src/xftglyphs.c	2013-11-28 01:39:49.000000000 -0600
-@@ -21,10 +21,10 @@
-  */
- 
- #include "xftint.h"
--#include <freetype/ftoutln.h>
--#include <freetype/ftlcdfil.h>
--
--#include <freetype/ftsynth.h>
-+#include <ft2build.h>
-+#include FT_OUTLINE_H
-+#include FT_LCD_FILTER_H
-+#include FT_SYNTHESIS_H
- 
- /*
-  * Validate the memory info for a font

diff --git a/x11-libs/libXft/libXft-2.3.1-r1.ebuild b/x11-libs/libXft/libXft-2.3.1-r1.ebuild
deleted file mode 100644
index 423d9d5..0000000
--- a/x11-libs/libXft/libXft-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="X.Org Xft library"
-
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXrender-0.8.2[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	media-libs/freetype[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	x11-proto/xproto[${MULTILIB_USEDEP}]
-	virtual/ttf-fonts"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.3.1-compile_fix.patch" )

diff --git a/x11-proto/glproto/glproto-1.4.17.ebuild b/x11-proto/glproto/glproto-1.4.17.ebuild
deleted file mode 100644
index c7d40b9..0000000
--- a/x11-proto/glproto/glproto-1.4.17.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org GL protocol headers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-LICENSE="SGI-B-2.0"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-opengl-1.2.6"
-DEPEND=""
-
-src_install() {
-	xorg-2_src_install
-	dynamic_libgl_install
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	eselect opengl set --ignore-missing --use-old xorg-x11
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		local gldir=/usr/$(get_libdir)/opengl/xorg-x11/include/GL
-		dodir ${gldir}
-		local x=""
-		# glext.h added for #54984
-		for x in "${ED}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
-			if [[ -f ${x} || -L ${x} ]]; then
-				mv -f "${x}" "${ED}"${gldir}
-			fi
-		done
-	eend 0
-}