aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild4
-rw-r--r--x11-libs/libXfont/Manifest1
-rw-r--r--x11-libs/libXfont/libXfont-9999.ebuild35
3 files changed, 2 insertions, 38 deletions
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 896dc9a..e45ef0b 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -25,7 +25,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
>=x11-libs/libpciaccess-0.12.901
>=x11-libs/libXau-1.0.4
>=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont-1.4.2
+ >=x11-libs/libXfont2-2.0.1
>=x11-libs/libxkbfile-1.0.4
>=x11-libs/libxshmfence-1.1
>=x11-libs/pixman-0.27.2
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
deleted file mode 100644
index cccc35a..0000000
--- a/x11-libs/libXfont/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD libXfont-9999.ebuild 928 SHA256 a6b98c7695e857c632070b8a9e8ffcf369deb5c4718581c37a3404d01587f6bf SHA512 b7a6863b2141dbf671db937be14a793c22b9694d9fa3872bbff600456f8452c94f82b3facbdab1184852d5131853209d8a863ccaed62685881a0dcaf5f985b41 WHIRLPOOL 09e9f9ef5ba64a5bbb6c9883f1e2772440bc2e832e8d22703bce56b2b13e67fe679825221251dfb23d9bb150f03c5dcd1c840a05329f05456765a70328257a53
diff --git a/x11-libs/libXfont/libXfont-9999.ebuild b/x11-libs/libXfont/libXfont-9999.ebuild
deleted file mode 100644
index 3c993f2..0000000
--- a/x11-libs/libXfont/libXfont-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-EGIT_REPO_URI="http://anongit.freedesktop.org/git/xorg/lib/${PN}.git"
-
-XORG_DOC=doc
-inherit xorg-2 git-2
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 ipv6 truetype"
-
-RDEPEND="x11-libs/xtrans
- x11-libs/libfontenc
- truetype? ( >=media-libs/freetype-2 )
- bzip2? ( app-arch/bzip2 )
- x11-proto/xproto
- x11-proto/fontsproto"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_enable doc devel-docs)
- $(use_with doc xmlto)
- $(use_with bzip2)
- $(use_enable truetype freetype)
- --without-fop
- )
- xorg-2_src_configure
-}