Fixed Ticket #218 and cleaned up the dir. Furthermore, keywords are removed and a deprecated warning was added.

3 files changed, 9 insertions, 130 deletions

diff --git a/x11-base/xglamo/Manifest b/x11-base/xglamo/Manifest
index 8571e2d..b8e9c4d 100644
--- a/x11-base/xglamo/Manifest
+++ b/x11-base/xglamo/Manifest
@@ -4,5 +4,4 @@ AUX xglamo-20081205/xserver-nodm 856 RMD160 87bcda36069294ebaebb2e993533c617d96d
 AUX xglamo-configure.patch 389 RMD160 b91dc85767bd4c301139f46a3b98cf7126c928b3 SHA1 b6ee4cf8eaa75a1d6d895a6f7dfe2a025c15263c SHA256 7d48f3ab345b0002bea1521a38fe113ffa9a695f2d0dacdef944cfcabaad7dd6
 AUX xglamo-no-pdfdoc.patch 397 RMD160 f59a8d6a052565917cb08551fb160dc73c2da2c7 SHA1 dbd48be531eb930dbf3df576074551016ee6bf53 SHA256 7d0b6e2df2909c4509549cdd914f50654ad3875032b36090fb009a5f4db4699f
 AUX xserver-nodm 1059 RMD160 fd69c6c0d1d66fb88abad9fa56a593daad55fbd0 SHA1 421108845edc8b0824abdb8fe063ed6129ca1115 SHA256 647b5363bf9c0f9c271fc926dc1ce66d198f321250c17f45cd890c23b0bd34e7
-EBUILD xglamo-20081205-r2.ebuild 3275 RMD160 b3a0e4966f26b8a776b035c9e6db4aff7056ae9f SHA1 628320b5fb5ac506db0196e6a282943da1ab13e3 SHA256 64a219fb5a57cec6191374d9483cce47816fcacc81699b973ad31aa614ebfc8b
-EBUILD xglamo-20081205.ebuild 3557 RMD160 c60c45458ca7fdd1f0b65cf57bad82d2a7d595d8 SHA1 b25bebd7bbd72386da165465b1aa0f247dcb5643 SHA256 f2bf5eb9fe1ffd9ec1bb184facd695885acbd81eb816695418e4fd3a6aa230ce
+EBUILD xglamo-20081205-r2.ebuild 3473 RMD160 a93eafb31b9b6fd567f80a280b15c248bc08c650 SHA1 d19d53aa74a6379a381ae9d09923660cfeed3d0f SHA256 80ad6a1e188c6f2d547431f3307792c28ef28a3bb976b436445b1710720cfcd1
diff --git a/x11-base/xglamo/xglamo-20081205-r2.ebuild b/x11-base/xglamo/xglamo-20081205-r2.ebuild
index 888c89b..e2aacad 100644
--- a/x11-base/xglamo/xglamo-20081205-r2.ebuild
+++ b/x11-base/xglamo/xglamo-20081205-r2.ebuild
@@ -19,14 +19,14 @@ SLOT="0"
 KEYWORDS="~arm ~x86 ~amd64"
 
 IUSE="dga doc dri sdl truetype xcomposite xinerama xprint xscreensaver xv
-      ${IUSE_INPUT_DEVICES}"
+	  ${IUSE_INPUT_DEVICES}"
 DOCS=""
 
 RDEPEND=">=x11-libs/tslib-1.0
 	sys-apps/debianutils
 	x11-libs/xtrans
 	x11-libs/libxkbfile
-	x11-libs/libXfont
+	=x11-libs/libXfont-1.3.4
 	x11-libs/libXau
 	x11-libs/libfontenc
 	>=x11-proto/randrproto-1.2
@@ -122,5 +122,10 @@ src_install() {
 	keepdir /etc/X11/Xsession.d
 	insinto /etc/X11/Xsession.d
 	newins "${FILESDIR}/${P}/Xwindowmanager" Xwindowmanager
-
 }
+
+pkg_postinst() {
+	ewarn "This package is deprecated and will be removed soon."
+	ewarn "Please use xorg with the xf86-video-glamo as a"
+	ewarn "replacement and help finding bugs there. Thanks!"
+}
\ No newline at end of file
diff --git a/x11-base/xglamo/xglamo-20081205.ebuild b/x11-base/xglamo/xglamo-20081205.ebuild
deleted file mode 100644
index a26bebd..0000000
--- a/x11-base/xglamo/xglamo-20081205.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools git toolchain-funcs
-
-DESCRIPTION="X server for the Openmoko Freerunner's smedia glamo GPU"
-HOMEPAGE="http://www.openmoko.org/"
-
-MY_P="xglamo"
-
-SRC_URI=""
-EGIT_REPO_URI="git://git.openmoko.org/git/${MY_P}.git"
-EGIT_BRANCH="master"
-EGIT_TREE="a8f2c29efb2043a539f21d6ab40f17c3302ea463"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~x86 ~amd64"
-
-IUSE_INPUT_DEVICES="input_devices_tslib"
-IUSE="dga doc dri kdrive sdl truetype xcomposite xinerama xprint xscreensaver xv
-      ${IUSE_INPUT_DEVICES}"
-DOCS=""
-
-RDEPEND="input_devices_tslib? ( >=x11-libs/tslib-1.0 )
-         x11-libs/xtrans
-         x11-libs/libxkbfile
-         x11-libs/libXfont
-         x11-libs/libXau
-         x11-libs/libfontenc
-         >=x11-proto/randrproto-1.2
-         x11-proto/renderproto
-         >=x11-proto/fixesproto-4.0
-         >=x11-proto/damageproto-1.1
-         x11-proto/xcmiscproto
-         x11-proto/xextproto
-         x11-proto/xproto
-         x11-proto/xf86miscproto
-         x11-proto/xf86vidmodeproto
-         x11-proto/xf86bigfontproto
-         >=x11-proto/scrnsaverproto-1.1
-         x11-proto/bigreqsproto
-         x11-proto/resourceproto
-         x11-proto/fontsproto
-         x11-proto/inputproto
-         x11-proto/xf86dgaproto
-         >=x11-proto/kbproto-1.0.3
-         x11-proto/trapproto
-         x11-proto/recordproto
-         x11-proto/evieext
-         x11-proto/xineramaproto
-         x11-proto/videoproto
-         x11-apps/xinit
-         kdrive? ( sdl? ( media-libs/libsdl ) )"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	# Fetch and unpack current git sources
-	git_src_unpack
-
-	if ! use doc; then
-		# Make sure we don't build a pdf documentation
-		epatch "${FILESDIR}"/xglamo-no-pdfdoc.patch
-	fi
-
-	if tc-is-cross-compiler; then
-		epatch "${FILESDIR}"/xglamo-configure.patch
-	fi
-
-	# reconfigure the autoconf stuff
-	eautoreconf --install || die "autoreconf failed"
-}
-
-src_compile() {
-	local myconf
-
-	# See the complete list at the end of this file
-	myconf="$(use_enable doc                 builddocs)   \
-		$(use_enable xcomposite          composite)   \
-		$(use_enable xv)                              \
-		$(use_enable dga)                             \
-		$(use_enable xscreensaver        screensaver) \
-		$(use_enable dri)                             \
-		$(use_enable xinerama)                        \
-		$(use_enable input_devices_tslib tslib)       \
-		$(use_enable xprint)                          \
-		$(use_enable kdrive)                          \
-		$(use_enable truetype            freetype)    \
-		--disable-xorgcfg               \
-		--disable-xfree86-utils         \
-		--disable-kbd_mode              \
-		--enable-install-setuid         \
-		--sysconfdir=/etc/X11           \
-		--localstatedir=/var            \
-		--with-fontdir=/usr/share/fonts \
-		--with-xkb-output=/var/lib/xkb"
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		myconf="${myconf} --enable-xsdl"
-	else
-		myconf="${myconf} --disable-xsdl"
-	fi
-
-	econf ${myconf} || die "configuration failed"
-	emake || die "Make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Create a symlink to enlightenment as the default wm if no
-	# display manager is installed.
-	cd ${D}/usr/bin
-	ln -s enlightenment_start x-window-manager
-
-	# Create a init script for the case we want
-	# to start without display manager.
-	newinitd "${FILESDIR}/xserver-nodm" xserver-nodm
-
-	dodoc AUTHORS NEWS README
-}