unmasked fix (replacing -r0 ebuild, as this is a fix for very specific compile-time problem) upon test reports

5 files changed, 32 insertions, 77 deletions

diff --git a/media-libs/esdl/ChangeLog b/media-libs/esdl/ChangeLog
index 6536983f50b9..760a93cd9455 100644
--- a/media-libs/esdl/ChangeLog
+++ b/media-libs/esdl/ChangeLog
@@ -1,13 +1,10 @@
 # ChangeLog for media-libs/esdl
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/esdl/ChangeLog,v 1.3 2003/06/18 00:37:18 george Exp $
-
-  17 Jun 2003; George Shapovalov <george@gentoo.org> esdl-0.93.0314-r1.ebuild :
-  testing nvidia headers fix (#22933).
-  Not adding *esdl-0.93.0314-r1 header, since this ebuild is supposed to disappear 
-  after testing (it will replace the -r0 one, - no need to force package recompilation 
-  on everybody. The -r1 ebuild is package.mask'ed now)
+# $Header: /var/cvsroot/gentoo-x86/media-libs/esdl/ChangeLog,v 1.4 2003/06/18 19:46:18 george Exp $
 
+  17 Jun 2003; George Shapovalov <george@gentoo.org> esdl-0.93.0314.ebuild :
+  nvidia headers fix (#22933).
+ 
 *esdl-0.93.0314 (10 May 2003)
 
   10 May 2003; George Shapovalov <george@gentoo.org> esdl-0.93.0314.ebuild, files/{esdl-0.93.0314.patch.bz2,digest-esdl-0.93.0314} :
diff --git a/media-libs/esdl/Manifest b/media-libs/esdl/Manifest
index 62a776462844..6338ef07683b 100644
--- a/media-libs/esdl/Manifest
+++ b/media-libs/esdl/Manifest
@@ -1,8 +1,6 @@
 MD5 2fe710a449ef5f869ff0220bd77cd33d esdl-0.93.0131.ebuild 774
-MD5 710d7296379900792f446fc94935d950 esdl-0.93.0314.ebuild 993
-MD5 63f798e3b2c440d75e43bca1da429433 ChangeLog 1032
-MD5 dc4b59b41210e374f051cbb6beb64b9d esdl-0.93.0314-r1.ebuild 1526
+MD5 66bc3678b7bed68dc92fdfc1b0fa6bca esdl-0.93.0314.ebuild 1522
+MD5 ea7311d8204c136f80d8eb29ba8d85a0 ChangeLog 795
 MD5 8c6bb528fe0c29b1318311231f051981 files/esdl-0.93.0314.patch.bz2 2977
 MD5 3305855c13a219a291b3c4c7d8c4a24f files/digest-esdl-0.93.0131 70
 MD5 c0f6fc715b86df64ac4ba1de4a0c9517 files/digest-esdl-0.93.0314 70
-MD5 c0f6fc715b86df64ac4ba1de4a0c9517 files/digest-esdl-0.93.0314-r1 70
diff --git a/media-libs/esdl/esdl-0.93.0314-r1.ebuild b/media-libs/esdl/esdl-0.93.0314-r1.ebuild
deleted file mode 100644
index df4132efe5ee..000000000000
--- a/media-libs/esdl/esdl-0.93.0314-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/esdl/esdl-0.93.0314-r1.ebuild,v 1.1 2003/06/18 00:37:18 george Exp $
-
-IUSE=""
-
-DESCRIPTION="Erlang bindings for the SDL library"
-SRC_URI="mirror://sourceforge/esdl/${P}.src.tar.gz"
-HOMEPAGE="http://esdl.sourceforge.net/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND=">=dev-lang/erlang-9b
-	>=media-libs/libsdl-1.2.4
-	x11-base/opengl-update"
-
-#openGL state tracking
-MY_OpenGL="xfree"
-
-pkg_setup() {
-	#check whether we have nvidia opengl active
-	if [ -n "`ls -l /usr/lib/libGL.so|grep nvidia`" ]; then
-		MY_OpenGL="nvidia"
-		einfo "detected nvidia drivers"
-		einfo "activating Mesa implementation temporarily"
-		opengl-update xfree
-	else
-		einfo "nvidia openGL is not active"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#Makefile wants to install some docs that arent' actually there
-	epatch ${FILESDIR}/${P}.patch.bz2
-}
-
-src_compile() {
-	make CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	ERLANG_DIR="/usr/lib/erlang/lib/"
-	ESDL_DIR="${ERLANG_DIR}/${P}"
-	dodir ${ESDL_DIR}
-
-	make install INSTALLDIR=${D}/${ESDL_DIR} || die
-	cp include/* ${D}/${ESDL_DIR}/include/ || die
-	dosym ${ESDL_DIR} ${ERLANG_DIR}/${PN}
-	dodoc Readme license.terms
-	mv ${D}/${ESDL_DIR}/doc/ ${D}/usr/share/doc/${PF}/html/
-}
-
-pkg_postinst() {
-	#now we need to activate proper openGL again
-	if [ $MY_OpenGL == "nvidia" ]; then
-		opengl-update nvidia
-		einfo "activating nvidia drivers"
-	fi
-}
diff --git a/media-libs/esdl/esdl-0.93.0314.ebuild b/media-libs/esdl/esdl-0.93.0314.ebuild
index eab3825b01ec..2d09fd8a7d45 100644
--- a/media-libs/esdl/esdl-0.93.0314.ebuild
+++ b/media-libs/esdl/esdl-0.93.0314.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/esdl/esdl-0.93.0314.ebuild,v 1.1 2003/05/11 00:36:00 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/esdl/esdl-0.93.0314.ebuild,v 1.2 2003/06/18 19:46:18 george Exp $
 
 IUSE=""
 
@@ -13,7 +13,23 @@ SLOT="0"
 KEYWORDS="x86"
 
 DEPEND=">=dev-lang/erlang-9b
-	>=media-libs/libsdl-1.2.4"
+	>=media-libs/libsdl-1.2.4
+	x11-base/opengl-update"
+
+#openGL state tracking
+MY_OpenGL="xfree"
+
+pkg_setup() {
+	#check whether we have nvidia opengl active
+	if [ -n "`ls -l /usr/lib/libGL.so|grep nvidia`" ]; then
+		MY_OpenGL="nvidia"
+		einfo "detected nvidia drivers"
+		einfo "activating Mesa implementation temporarily"
+		opengl-update xfree
+	else
+		einfo "nvidia openGL is not active"
+	fi
+}
 
 src_unpack() {
 	unpack ${A}
@@ -37,3 +53,11 @@ src_install() {
 	dodoc Readme license.terms
 	mv ${D}/${ESDL_DIR}/doc/ ${D}/usr/share/doc/${PF}/html/
 }
+
+pkg_postinst() {
+	#now we need to activate proper openGL again
+	if [ $MY_OpenGL == "nvidia" ]; then
+		opengl-update nvidia
+		einfo "activating nvidia drivers"
+	fi
+}
diff --git a/media-libs/esdl/files/digest-esdl-0.93.0314-r1 b/media-libs/esdl/files/digest-esdl-0.93.0314-r1
deleted file mode 100644
index 9556974eb3c6..000000000000
--- a/media-libs/esdl/files/digest-esdl-0.93.0314-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a89add6d7cceae8aaf5149f86fc73b6 esdl-0.93.0314.src.tar.gz 397043