Revision bump. Sync to CVS as of today and build against xorg-6.8.2

instead of xfree86.  Fixes bug #76167.
(Portage version: 2.0.52-r1)

4 files changed, 109 insertions, 6 deletions

diff --git a/x11-base/xdirectfb/ChangeLog b/x11-base/xdirectfb/ChangeLog
index 7d370485fe16..95fa2ed6169b 100644
--- a/x11-base/xdirectfb/ChangeLog
+++ b/x11-base/xdirectfb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xdirectfb
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/ChangeLog,v 1.23 2005/08/25 00:06:53 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/ChangeLog,v 1.24 2005/09/10 06:17:32 joshuabaergen Exp $
+
+*xdirectfb-1.0_rc5-r2 (10 Sep 2005)
+
+  10 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xdirectfb-1.0_rc5-r2.ebuild:
+  Revision bump.  Sync to CVS as of today and build against xorg-6.8.2 
+  instead of xfree86.  Fixes bug #76167.
 
   25 Aug 2005; Joshua Baergen <joshuabaergen@gentoo.org>
   xdirectfb-1.0_rc5-r1.ebuild:
diff --git a/x11-base/xdirectfb/Manifest b/x11-base/xdirectfb/Manifest
index 479ad1b08ccd..1c7b38f3dcff 100644
--- a/x11-base/xdirectfb/Manifest
+++ b/x11-base/xdirectfb/Manifest
@@ -1,8 +1,10 @@
-MD5 b1468625b0df34d4cb3e06f2f3c039cb xdirectfb-1.0_rc5-r1.ebuild 2073
+MD5 92e4b98c1e2fc45fc045138549101b11 ChangeLog 3672
 MD5 7191cffeda5249a1cafc736e2459daac metadata.xml 278
-MD5 be3944dd19f29d095dae2e741c3e4f87 ChangeLog 3432
-MD5 cfa9672e095e12c7ab91422ee06fdbf3 files/digest-xdirectfb-1.0_rc5-r1 308
+MD5 b1468625b0df34d4cb3e06f2f3c039cb xdirectfb-1.0_rc5-r1.ebuild 2073
+MD5 838b62108c45d025a03f91fec344bc83 xdirectfb-1.0_rc5-r2.ebuild 2087
 MD5 53e2b736d916f4e4dbb287b52526f564 files/.dfbserverrc 940
-MD5 d1bc78938748c36ba47bf119d923dfdb files/startxdfb 1436
-MD5 625e74462ca9d2751a3a2607382f9106 files/host.def 456
 MD5 d38fb61c0ade184ffc8e4c080f25ea28 files/dfbserverrc 38
+MD5 625e74462ca9d2751a3a2607382f9106 files/host.def 456
+MD5 d1bc78938748c36ba47bf119d923dfdb files/startxdfb 1436
+MD5 cfa9672e095e12c7ab91422ee06fdbf3 files/digest-xdirectfb-1.0_rc5-r1 308
+MD5 181bed9102110e91c4de60d7d211901b files/digest-xdirectfb-1.0_rc5-r2 211
diff --git a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc5-r2 b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc5-r2
new file mode 100644
index 000000000000..b456cc889c35
--- /dev/null
+++ b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc5-r2
@@ -0,0 +1,3 @@
+MD5 8131cd7ea1e4566e6e05c438a93fcfe1 X11R6.8.2-src.tar.bz2 44371402
+MD5 fa7b791d117ab891080eedc71f923884 XDirectFB-1.0-rc5.tar.gz 96105
+MD5 c71a9d570aeb20b9ad8e9aa79eb9418b XDirectFB-to-2005-09-09.tar.bz2 78396
diff --git a/x11-base/xdirectfb/xdirectfb-1.0_rc5-r2.ebuild b/x11-base/xdirectfb/xdirectfb-1.0_rc5-r2.ebuild
new file mode 100644
index 000000000000..0bdc2e4d0243
--- /dev/null
+++ b/x11-base/xdirectfb/xdirectfb-1.0_rc5-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/xdirectfb-1.0_rc5-r2.ebuild,v 1.1 2005/09/10 06:17:32 joshuabaergen Exp $
+
+inherit eutils
+
+CVS_PATCH_DATE="2005-09-09"
+
+MY_PN="XDirectFB"
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+MY_V=X11R6.8.2
+S=${WORKDIR}/xc
+X=${WORKDIR}/${MY_P}
+
+DESCRIPTION="XDirectFB is a rootless XServer on top of DirectFB"
+SRC_URI="http://xorg.freedesktop.org/${MY_V}/src-single/${MY_V}-src.tar.bz2
+	http://www.directfb.org/download/${MY_PN}/${MY_P}.tar.gz
+	mirror://gentoo/XDirectFB-to-${CVS_PATCH_DATE}.tar.bz2"
+HOMEPAGE="http://www.directfb.org"
+
+SLOT="0"
+LICENSE="X11"
+KEYWORDS="x86 -sparc ~alpha ~ppc"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.1
+	>=sys-libs/zlib-1.1.3-r2
+	sys-devel/flex
+	dev-lang/perl
+	>=dev-libs/DirectFB-0.9.17"
+
+src_unpack () {
+	unpack ${A}
+
+	cd ${X}
+	# Update to latest CVS snapshot
+	epatch ${WORKDIR}/XDirectFB-to-${CVS_PATCH_DATE}.patch
+
+	cp xc-directfb-xorg.diff ${S}
+	cp -pPR programs/Xserver/hw/directfb ${S}/programs/Xserver/hw
+	cp ${X}/config/cf/* ${S}/config/cf
+	cp ${FILESDIR}/host.def ${S}/config/cf/
+
+	cd ${S}
+	epatch ./xc-directfb-xorg.diff
+
+	cd ${S}/programs/Xserver/hw/directfb
+	cp directfbScreen.c rootlessDirectFB.c ${T}
+
+
+	# update changes in the newer DirectFB versions
+	sed "s:DSPF_RGB15:DSPF_ARGB1555:g" \
+		${T}/directfbScreen.c > directfbScreen.c
+
+	sed "s:DSPF_RGB15:DSPF_ARGB1555:g" \
+		${T}/rootlessDirectFB.c > rootlessDirectFB.c
+
+}
+
+src_compile() {
+	emake World || die
+}
+
+src_install() {
+#	make install DESTDIR=${D}
+
+	exeinto /usr/X11R6/bin
+	doexe ${S}/programs/Xserver/XDirectFB
+	doexe ${FILESDIR}/startxdfb
+
+	mv ${S}/programs/Xserver/hw/directfb/XDirectFB._man ./XDirectFB.1x
+	insinto /usr/X11R6/man/man1
+	doins ${S}/XDirectFB.1x
+	dodir /etc/skel
+	dodir /etc/X11/xinit
+	cp ${FILESDIR}/.dfbserverrc ${D}/etc/skel
+	cp ${FILESDIR}/dfbserverrc ${D}/etc/X11/xinit
+
+	dohtml ${S}/programs/Xserver/hw/directfb/XDirectFB.1x.html
+
+	cd ${X}
+	dodoc AUTHORS ChangeLog README TODO
+}
+
+pkg_postinst() {
+	chmod 4711 /usr/X11R6/bin/XDirectFB
+	chmod 755 /usr/X11R6/bin/startxdfb
+
+	einfo "To start XDirectFB use the startxdfb utility."
+}