From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 671E11382C5 for ; Tue, 8 May 2018 22:07:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A91FCE0905; Tue, 8 May 2018 22:07:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7BD78E0905 for ; Tue, 8 May 2018 22:07:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 957D9335C72 for ; Tue, 8 May 2018 22:07:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54D37243 for ; Tue, 8 May 2018 22:07:04 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1525817209.cd3ab53327dcc8b63148cb2891c9700f2dd12b1c.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-x11/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild X-VCS-Directories: x11-base/xorg-x11/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: cd3ab53327dcc8b63148cb2891c9700f2dd12b1c X-VCS-Branch: master Date: Tue, 8 May 2018 22:07:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 981297bc-ee83-4772-883c-fb5182548bfb X-Archives-Hash: 112544a9d6d758b1d82430a21f08a7d1 commit: cd3ab53327dcc8b63148cb2891c9700f2dd12b1c Author: charIes17 arcor de> AuthorDate: Fri Dec 15 18:56:03 2017 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue May 8 22:06:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd3ab533 x11-base/xorg-x11: Allow sys-power/acpilight Allow to install sys-power/acpilight instead of x11-apps/xbacklight Also bump to EAPI=6 Closes: https://bugs.gentoo.org/622678 Closes: https://github.com/gentoo/gentoo/pull/6559 x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild | 149 +++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild new file mode 100644 index 00000000000..04ee6d43506 --- /dev/null +++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)" +HOMEPAGE="https://www.x.org/wiki/" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +# 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 sys-power/acpilight ) + 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 + 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 "${EROOT%/}/etc/X11/xorg.conf" ]]; then + cp "${EROOT%/}/etc/X11/xorg.conf" "${T}" || die + fi +} + +pkg_postinst() { + # Restore saved xorg.conf + if [[ -f "${T}/xorg.conf" ]]; then + cp "${T}/xorg.conf" "${EROOT%/}/etc/X11/xorg.conf" || die + fi + + elog + elog "Please note that the xcursors are in ${EROOT%/}/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 "${EROOT%/}/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 ${EROOT%/}/usr/bin/startx." + elog + + elog "Visit https://wiki.gentoo.org/wiki/Category:X.Org" + elog "for more information on configuring X." + elog +}