Add xorg-x11 ebuild without nonfree fonts.

Move the nonfree B&H font packages behind USE=bh-fonts.

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
new file mode 100644 (file)
index 0000000..bee37ac
--- /dev/null
+++ b/x11-base/xorg-x11/Manifest
@@ -0,0 +1 @@
+EBUILD xorg-x11-7.4-r2.ebuild 3700 SHA256 127ed4ae0fcf4c7a68dac54609a4feab25865082bc05d698d5bf23c49d2303b1 SHA512 e3964def1463e6353fc7759118df8f5ce5ce3f8abb1d1bb3537948c7b0d9448a1fc195c6a0933dc985d3e8f48e1964e6ce815edb06c0a74f8806e0cc3564453c WHIRLPOOL d00152e6eb772881bd5f9cda22c41999c881a88329de6094d146104a479aead78e3c7aac93069a0217a52a0466c00842010aed5dfb5f1e0cd59777bd36471386

diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
new file mode 100644 (file)
index 0000000..284e4bc
--- /dev/null
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild,v 1.3 2012/10/06 20:41:11 ulm Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)"
+HOMEPAGE="http://xorg.freedesktop.org"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="bh-fonts"
+
+# Server
+RDEPEND="${RDEPEND}
+       x11-base/xorg-server[-minimal]"
+
+# Applications
+RDEPEND="${RDEPEND}
+       x11-apps/appres
+       x11-apps/bitmap
+       x11-apps/iceauth
+       x11-apps/luit
+       x11-apps/mkfontdir
+       x11-apps/mkfontscale
+       x11-apps/sessreg
+       x11-apps/setxkbmap
+       x11-apps/smproxy
+       x11-apps/x11perf
+       x11-apps/xauth
+       x11-apps/xbacklight
+       x11-apps/xcmsdb
+       x11-apps/xcursorgen
+       x11-apps/xdpyinfo
+       x11-apps/xdriinfo
+       x11-apps/xev
+       x11-apps/xf86dga
+       x11-apps/xgamma
+       x11-apps/xhost
+       x11-apps/xinput
+       x11-apps/xkbcomp
+       x11-apps/xkbevd
+       x11-apps/xkbutils
+       x11-apps/xkill
+       x11-apps/xlsatoms
+       x11-apps/xlsclients
+       x11-apps/xmodmap
+       x11-apps/xpr
+       x11-apps/xprop
+       x11-apps/xrandr
+       x11-apps/xrdb
+       x11-apps/xrefresh
+       x11-apps/xset
+       x11-apps/xsetroot
+       x11-apps/xvinfo
+       x11-apps/xwd
+       x11-apps/xwininfo
+       x11-apps/xwud
+       "
+
+# Data
+RDEPEND="${RDEPEND}
+       x11-misc/xbitmaps
+       x11-themes/xcursor-themes
+       "
+
+# Utilities
+RDEPEND="${RDEPEND}
+       x11-misc/makedepend
+       x11-misc/util-macros
+       "
+
+# Fonts
+RDEPEND="${RDEPEND}
+       media-fonts/font-adobe-100dpi
+       media-fonts/font-adobe-75dpi
+       media-fonts/font-adobe-utopia-100dpi
+       media-fonts/font-adobe-utopia-75dpi
+       media-fonts/font-adobe-utopia-type1
+       media-fonts/font-alias
+       media-fonts/font-arabic-misc
+       bh-fonts? (
+               media-fonts/font-bh-100dpi
+               media-fonts/font-bh-75dpi
+               media-fonts/font-bh-lucidatypewriter-100dpi
+               media-fonts/font-bh-lucidatypewriter-75dpi
+               media-fonts/font-bh-ttf
+               media-fonts/font-bh-type1
+       )
+       media-fonts/font-bitstream-100dpi
+       media-fonts/font-bitstream-75dpi
+       media-fonts/font-bitstream-speedo
+       media-fonts/font-bitstream-type1
+       media-fonts/font-cronyx-cyrillic
+       media-fonts/font-cursor-misc
+       media-fonts/font-daewoo-misc
+       media-fonts/font-dec-misc
+       media-fonts/font-ibm-type1
+       media-fonts/font-isas-misc
+       media-fonts/font-jis-misc
+       media-fonts/font-micro-misc
+       media-fonts/font-misc-cyrillic
+       media-fonts/font-misc-ethiopic
+       media-fonts/font-misc-meltho
+       media-fonts/font-misc-misc
+       media-fonts/font-mutt-misc
+       media-fonts/font-schumacher-misc
+       media-fonts/font-screen-cyrillic
+       media-fonts/font-sony-misc
+       media-fonts/font-sun-misc
+       media-fonts/font-util
+       media-fonts/font-winitzki-cyrillic
+       media-fonts/font-xfree86-type1
+
+       media-fonts/font-alias
+       media-fonts/font-util
+       media-fonts/encodings
+       "
+
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+       # Save xorg.conf because of bug #278268
+       if [[ -f "${ROOT}etc/X11/xorg.conf" ]]; then
+               cp "${ROOT}etc/X11/xorg.conf" "${T}"
+       fi
+}
+
+pkg_postinst() {
+       # Restore saved xorg.conf
+       if [[ -f "${T}/xorg.conf" ]]; then
+               cp "${T}/xorg.conf" "${ROOT}etc/X11/xorg.conf"
+       fi
+
+       elog
+       elog "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}."
+       elog "Any custom cursor sets should be placed in that directory."
+       elog
+       elog "If you wish to set system-wide default cursors, please create"
+       elog "${ROOT}usr/local/share/cursors/${PN}/default/index.theme"
+       elog "with content: \"Inherits=theme_name\" so that future"
+       elog "emerges will not overwrite those settings."
+       elog
+       elog "Listening on TCP is disabled by default with startx."
+       elog "To enable it, edit ${ROOT}usr/bin/startx."
+       elog
+
+       # (#76985)
+       elog "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop"
+       elog "for more information on configuring X."
+       elog
+}