From 60bf1b1f8310f150debabd9ab635d973fb826241 Mon Sep 17 00:00:00 2001 From: Remi Cardona Date: Mon, 21 Sep 2009 15:28:53 +0000 Subject: x11-base/xorg-x11: drop old ebuilds, add new simplified meta (only a meta) Package-Manager: portage-2.2_rc41/cvs/Linux i686 --- x11-base/xorg-x11/ChangeLog | 8 +- x11-base/xorg-x11/Manifest | 4 +- x11-base/xorg-x11/xorg-x11-7.3.ebuild | 120 -------------------------- x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild | 142 +++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+), 123 deletions(-) delete mode 100644 x11-base/xorg-x11/xorg-x11-7.3.ebuild create mode 100644 x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild (limited to 'x11-base') diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 0bf41205e4c2..e0df409364d9 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.610 2009/09/19 18:38:10 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.611 2009/09/21 15:28:53 remi Exp $ + +*xorg-x11-7.4-r1 (21 Sep 2009) + + 21 Sep 2009; Rémi Cardona -xorg-x11-7.3.ebuild, + +xorg-x11-7.4-r1.ebuild: + drop old ebuilds, add new simplified meta (only a meta) 19 Sep 2009; Rémi Cardona xorg-x11-7.2.ebuild, xorg-x11-7.3.ebuild, xorg-x11-7.4.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 89196cdd8151..d38762f210b6 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,5 +1,5 @@ EBUILD xorg-x11-7.2.ebuild 3791 RMD160 92764b58f5a8c34d00f484abd19bd0c7b01bb8d2 SHA1 4af5f33bbb7f8a270f5d5505c2d9442d9b5ab2ee SHA256 83e4f03b99d3bda6af6ea35ecbd3b2823f57208e6ceb75a822d3915375252aa8 -EBUILD xorg-x11-7.3.ebuild 3820 RMD160 1b8f565cabf052a705b339d9670c6d41ac668ebd SHA1 14e2009ace3dece80e05d66063f95f058643e178 SHA256 cfed4a90b92ecd926efb247b4cdc1c10475b2f6e31e6b461c85661f3baec17e6 +EBUILD xorg-x11-7.4-r1.ebuild 3416 RMD160 bb5e13d967acc06ca95620590c4fed69f2d69894 SHA1 f44a87731ffcc070ce3bfe3b2cc37005113fbc70 SHA256 58e7d348e79a3ff9a80ff259242283a66730ecb780c41f7f4f1e4b2caacf592e EBUILD xorg-x11-7.4.ebuild 7559 RMD160 24dad052ee3674554a6b74a58762d380653405f9 SHA1 09afe6b90800ede07b97c5642dd6189300bce1ab SHA256 00ed60ac762518ea6d17fe467211f53c065eea3450964875ce564509a02270f8 -MISC ChangeLog 129136 RMD160 32c1e4bbabe6b33f73ab2ff113782774b755aae8 SHA1 1bdc5462bc694eb391d3a157c3f94f41e11a3236 SHA256 245702d09e0535f09b3bca65e0a5ccf5b414c21d6d7d0d5d27d774406137065a +MISC ChangeLog 129323 RMD160 f3247d50ef9a719ce52006661616e1136b748746 SHA1 1cef10a79592585c8703460023978cffcd45185b SHA256 f1ed84d233b9f02701fcd40d39087865800bca8c55974072588a0374544876d4 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 diff --git a/x11-base/xorg-x11/xorg-x11-7.3.ebuild b/x11-base/xorg-x11/xorg-x11-7.3.ebuild deleted file mode 100644 index 9b1b9caf2336..000000000000 --- a/x11-base/xorg-x11/xorg-x11-7.3.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2009 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.3.ebuild,v 1.5 2009/09/19 18:38:10 remi Exp $ - -inherit eutils - -DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)" -HOMEPAGE="http://xorg.freedesktop.org" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -# Collision protect will scream bloody murder if we install over old versions -RDEPEND="!<=x11-base/xorg-x11-6.9" - -# Server -RDEPEND="${RDEPEND} - >=x11-base/xorg-server-1.4" - -# Common Applications -RDEPEND="${RDEPEND} - >=x11-apps/mesa-progs-6.5.2 - >=x11-apps/setxkbmap-1.0.4 - >=x11-apps/xauth-1.0.2 - >=x11-apps/xhost-1.0.2 - >=x11-apps/xinit-1.0.5 - >=x11-apps/xmodmap-1.0.3 - >=x11-apps/xrandr-1.2.2 - >=x11-apps/mkfontdir-1.0.3" - -# Common Libraries - move these to eclass eventually -RDEPEND="${RDEPEND} - >=x11-libs/libSM-1.0.3 - >=x11-libs/libXcomposite-0.4 - >=x11-libs/libXcursor-1.1.9 - >=x11-libs/libXdamage-1.1 - >=x11-libs/libXfixes-4.0.3 - >=x11-libs/libXp-1 - >=x11-libs/libXv-1.0.3 - >=x11-libs/libXxf86dga-1.0.2 - >=x11-libs/libXinerama-1.0.2 - >=x11-libs/libXScrnSaver-1.1.2" - -# Some fonts -RDEPEND="${RDEPEND} - media-fonts/ttf-bitstream-vera - >=media-fonts/font-bh-type1-1 - >=media-fonts/font-adobe-utopia-type1-1.0.1 - >=media-fonts/font-adobe-100dpi-1" - -DEPEND="${RDEPEND}" - -src_install() { - # Make /usr/X11R6 a symlink to ../usr. - dodir /usr - dosym ../usr /usr/X11R6 -} - -pkg_preinst() { - # Check for /usr/X11R6 -> /usr symlink - if [[ -e "${ROOT}usr/X11R6" ]] && - [[ $(readlink "${ROOT}usr/X11R6") != "../usr" ]]; then - eerror "${ROOT}usr/X11R6 isn't a symlink to ../usr. Please delete it." - ewarn "First, save a list of all the packages installing there:" - ewarn " equery belongs ${ROOT}usr/X11R6 > usr-x11r6-packages" - ewarn "This requires gentoolkit to be installed." - die "${ROOT}usr/X11R6 is not a symlink to ../usr." - fi - - # Filter out ModulePath line since it often holds a now-invalid path - # Bug #112924 - # For RC3 - filter out RgbPath line since it also seems to break things - XORGCONF="/etc/X11/xorg.conf" - if [[ -e ${ROOT}${XORGCONF} ]]; then - mkdir -p "${D}/etc/X11" - sed "/ModulePath/d" "${ROOT}${XORGCONF}" > "${D}${XORGCONF}" - sed -i "/RgbPath/d" "${D}${XORGCONF}" - fi -} - -pkg_postinst() { - # I'm not sure why this was added, but we don't inherit x-modular - # x-modular_pkg_postinst - - echo - einfo "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}." - einfo "Any custom cursor sets should be placed in that directory." - echo - einfo "If you wish to set system-wide default cursors, please create" - einfo "${ROOT}usr/local/share/cursors/${PN}/default/index.theme" - einfo "with content: \"Inherits=theme_name\" so that future" - einfo "emerges will not overwrite those settings." - echo - einfo "Listening on TCP is disabled by default with startx." - einfo "To enable it, edit ${ROOT}usr/bin/startx." - echo - - ewarn "Please read the modular X migration guide at" - ewarn "http://www.gentoo.org/proj/en/desktop/x/x11/modular-x-howto.xml" - echo - einfo "If you encounter any non-configuration issues, please file a bug at" - einfo "http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux" - einfo "and attach ${ROOT}etc/X11/xorg.conf, ${ROOT}var/log/Xorg.0.log and emerge info" - echo - einfo "You can now choose which drivers are installed with the VIDEO_CARDS" - einfo "and INPUT_DEVICES settings. Set these like any other Portage" - einfo "variable in ${ROOT}etc/make.conf or on the command line." - echo - - # (#76985) - einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop" - einfo "for more information on configuring X." - echo - - # Try to get people to read this, pending #11359 - ebeep 5 - epause 10 -} diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild new file mode 100644 index 000000000000..f5e7cbae2578 --- /dev/null +++ b/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/09/21 15:28:53 remi Exp $ + +EAPI="2" + +inherit eutils + +DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)" +HOMEPAGE="http://xorg.freedesktop.org" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~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 + 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/xsetmode + 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_postinst() { + 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 +} -- cgit v1.2.3-65-gdbad