Ported to modular X. Added X and openal USE flags. Fixed building of the optional opengl package. Removed an old revision.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 93 insertions, 30 deletions

diff --git a/dev-lang/hugs98/ChangeLog b/dev-lang/hugs98/ChangeLog
index 6ec2fc450b2c..217e179d8864 100644
--- a/dev-lang/hugs98/ChangeLog
+++ b/dev-lang/hugs98/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/hugs98
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/ChangeLog,v 1.25 2005/10/02 19:47:04 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/ChangeLog,v 1.26 2006/02/16 02:15:58 dcoutts Exp $
+
+*hugs98-2005.3-r2 (16 Feb 2006)
+
+  16 Feb 2006; <duncan@gentoo.org> -hugs98-2005.3.ebuild,
+  +hugs98-2005.3-r2.ebuild:
+  Ported to modular X. Added X and openal USE flags. Fixed building of the
+  optional opengl package. Removed an old revision.
 
   02 Oct 2005; Aron Griffis <agriffis@gentoo.org> hugs98-2005.3-r1.ebuild:
   Mark 2005.3-r1 stable on alpha
diff --git a/dev-lang/hugs98/Manifest b/dev-lang/hugs98/Manifest
index 237cbf311218..dbf2472e6b08 100644
--- a/dev-lang/hugs98/Manifest
+++ b/dev-lang/hugs98/Manifest
@@ -1,9 +1,37 @@
-MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 be2c5dd116a70673d905d82f0dbf9f6f ChangeLog 4960
-MD5 9dc6f3b3a7078e9c867754ba5110989e hugs98-2005.3.ebuild 2126
-MD5 acd9560964734571829a7a9fa4f09be2 hugs98-2005.3-r1.ebuild 2243
-MD5 82baad88b726920518455a0b2c393f89 hugs98-2003.11.ebuild 2498
-MD5 4c6e27fe15252dea9f141e0f6b06ed36 files/hugs98-2003.11-gcc34.patch 303
-MD5 0f560de47a443f3bea9cf87df2e85b81 files/digest-hugs98-2005.3-r1 133
-MD5 6a471250900fa1157b523eea5bbbe54d files/digest-hugs98-2005.3 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e472248eda41350e58862b01b675acdc ChangeLog 5206
+RMD160 ee01a7e64cfb7c5392ea9e7244beb23f79394176 ChangeLog 5206
+SHA256 3e4dc1ba96241586c07c1115486ccb2a08c6371efbb29cb60b3113b531cb50aa ChangeLog 5206
 MD5 eb7ae57bb23e867135381cbd99c5c1c0 files/digest-hugs98-2003.11 67
+RMD160 22a7c4f341235c48d815661dbcd6bd09ea7e349c files/digest-hugs98-2003.11 67
+SHA256 bba01220731cd99e559c50dd5ad243da635a47a797d83145e07c16722a4690dd files/digest-hugs98-2003.11 67
+MD5 0f560de47a443f3bea9cf87df2e85b81 files/digest-hugs98-2005.3-r1 133
+RMD160 461a2943d725c13bf6d571e796283239f68e84b2 files/digest-hugs98-2005.3-r1 133
+SHA256 145054745f547755f111fb215cd8a731e5524d3374aceb1fa9ef84b5134cf238 files/digest-hugs98-2005.3-r1 133
+MD5 1cb812b69293fe12db78788c237a3401 files/digest-hugs98-2005.3-r2 491
+RMD160 d05ca087ccd529ee021850cbf5189eee74717095 files/digest-hugs98-2005.3-r2 491
+SHA256 2e788c888d2a255a600a26d9c75e61419b889531be148584f623c355c6092154 files/digest-hugs98-2005.3-r2 491
+MD5 4c6e27fe15252dea9f141e0f6b06ed36 files/hugs98-2003.11-gcc34.patch 303
+RMD160 db9c39870607d55182f1d09e7d52d6d03d7a9935 files/hugs98-2003.11-gcc34.patch 303
+SHA256 d59a4b1d9fe4632d0a551aaeb2bc53e5804c88948e0a797220f427f0b452879d files/hugs98-2003.11-gcc34.patch 303
+MD5 82baad88b726920518455a0b2c393f89 hugs98-2003.11.ebuild 2498
+RMD160 7d5055cdc5f43465f35e0eac36559d2de85d3886 hugs98-2003.11.ebuild 2498
+SHA256 57bcbdc2d3b77b9cde0deb36921da2e28798fe85eecdf1f02c0a5ec1a8d5054f hugs98-2003.11.ebuild 2498
+MD5 acd9560964734571829a7a9fa4f09be2 hugs98-2005.3-r1.ebuild 2243
+RMD160 a91956532064253e4524d09533f77212f9ad35e4 hugs98-2005.3-r1.ebuild 2243
+SHA256 6e64b4670dd1edb87d366b501401d96ad8f0c9b6967bf8b4d5f9651e6e125e16 hugs98-2005.3-r1.ebuild 2243
+MD5 7c9b34c9e816d9740e7099ab8f99eea4 hugs98-2005.3-r2.ebuild 2910
+RMD160 3ab17446cf44d5eb60da013a240416ec320bd1d7 hugs98-2005.3-r2.ebuild 2910
+SHA256 59492581f8021b39a9185de70b0dc3668b4bc78828d1b34e28bb300f2c7a949b hugs98-2005.3-r2.ebuild 2910
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
+RMD160 57bc74b2471cd3dba6dcdcce531df8eb82893cee metadata.xml 224
+SHA256 2b30834e4d9f141a1e1b63457d4af1f6a8cb6d4a47f8dd3b14e726277079769b metadata.xml 224
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFD8+Bp/B0cxt+cq+wRAncLAKCYrOKlfI20lXnM6ixJbrqNo0u4OACfXorv
+4g7VbbVWWZOFpM7iZP1Iz80=
+=6Vmf
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/hugs98/files/digest-hugs98-2005.3 b/dev-lang/hugs98/files/digest-hugs98-2005.3
deleted file mode 100644
index 32dfe6a07084..000000000000
--- a/dev-lang/hugs98/files/digest-hugs98-2005.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6c2826a51529b269b11057da6c1e6f6 hugs98-Mar2005.tar.gz 4198745
diff --git a/dev-lang/hugs98/files/digest-hugs98-2005.3-r2 b/dev-lang/hugs98/files/digest-hugs98-2005.3-r2
new file mode 100644
index 000000000000..cbd5745e4af6
--- /dev/null
+++ b/dev-lang/hugs98/files/digest-hugs98-2005.3-r2
@@ -0,0 +1,6 @@
+MD5 8e423473750498b6626af32f551da3c5 hugs98-Mar2005-patch.gz 5304
+RMD160 7eb44a997cc7a94528753851024025eabf282296 hugs98-Mar2005-patch.gz 5304
+SHA256 3551cb640ef0d6fc5b97e94ac3303f00171ce1a0e4144d615d0982863c1dbe34 hugs98-Mar2005-patch.gz 5304
+MD5 e6c2826a51529b269b11057da6c1e6f6 hugs98-Mar2005.tar.gz 4198745
+RMD160 4c3b391a7364a199694ab8c7946146eb37b7c95c hugs98-Mar2005.tar.gz 4198745
+SHA256 a6b9b82aea02e76b4e7359172ef7c71abe58b3104a77d109cb3393bf0bbe6227 hugs98-Mar2005.tar.gz 4198745
diff --git a/dev-lang/hugs98/hugs98-2005.3.ebuild b/dev-lang/hugs98/hugs98-2005.3-r2.ebuild
index 5412b9169b0a..a88bf8afae18 100644
--- a/dev-lang/hugs98/hugs98-2005.3.ebuild
+++ b/dev-lang/hugs98/hugs98-2005.3-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2005.3.ebuild,v 1.2 2005/03/19 12:34:14 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2005.3-r2.ebuild,v 1.1 2006/02/16 02:15:58 dcoutts Exp $
 
 inherit base flag-o-matic eutils versionator
 
-IUSE="opengl"
+IUSE="X opengl openal"
 
 # version numbering of Hugs is rather strange
 # we have to transform 2003.11 -> Nov2003
@@ -33,20 +33,47 @@ MY_PV="${HUGS_MONTH}$(get_major_version )"
 MY_P="${PN}-${MY_PV}"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="The HUGS98 Haskell interpreter"
-SRC_URI="http://cvs.haskell.org/Hugs/downloads/${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="http://cvs.haskell.org/Hugs/downloads/${MY_PV}/${MY_P}.tar.gz
+		 http://cvs.haskell.org/Hugs/downloads/${MY_PV}/${MY_P}-patch.gz"
 HOMEPAGE="http://www.haskell.org/hugs/"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 LICENSE="as-is"
 
-DEPEND="virtual/libc
+RDEPEND="
+	X? ( || ( x11-libs/libX11 virtual/x11 ) )
 	opengl? ( virtual/opengl virtual/glu virtual/glut )
+	openal? ( media-libs/openal )"
+DEPEND="${RDEPEND}
+	opengl? ( x11-base/opengl-update )
 	~app-text/docbook-sgml-dtd-4.2"
 
 src_unpack() {
 	base_src_unpack
-	cd ${S}/src
+	cd ${S}
+	epatch ${WORKDIR}/${MY_P}-patch
+
+	if ! use X; then
+		sed -i -e 's/X11//' -e 's/HGL//' "${S}/Makefile" \
+			"${S}/libraries/tools/convert_libraries" \
+			"${S}/libraries/tools/test_libraries"
+		rm -r "${S}/fptools/libraries/X11" "${S}/fptools/libraries/HGL"
+	fi
+
+	if ! use opengl; then
+		sed -i -e 's/OpenGL//' -e 's/GLUT//' "${S}/Makefile" \
+			"${S}/libraries/tools/convert_libraries" \
+			"${S}/libraries/tools/test_libraries"
+		rm -r "${S}/fptools/libraries/OpenGL" "${S}/fptools/libraries/GLUT"
+	fi
+
+	if ! use openal; then
+		sed -i 's/OpenAL//' "${S}/Makefile" \
+			"${S}/libraries/tools/convert_libraries" \
+			"${S}/libraries/tools/test_libraries"
+		rm -r "${S}/fptools/libraries/OpenAL"
+	fi
 }
 
 src_compile() {
@@ -58,22 +85,18 @@ src_compile() {
 	[ "${ARCH}" = "ppc" ] && filter-flags "-O?"
 
 	if use opengl; then
-		myconf="--enable-hopengl"
-		# the nvidia drivers *seem* not to work together
-		# with pthreads
-		[ ! -f /etc/env.d/09opengl ] \
-			|| [ -z "`grep opengl/nvidia/lib /etc/env.d/09opengl`" ] \
-			&& myconf="$myconf --with-pthreads" \
-			|| myconf="--with-pthreads"
+		myconf="--enable-opengl"
+		# the nvidia drivers *seem* not to work together with pthreads
+		if ! /usr/sbin/opengl-update --get-implementation | grep -q nvidia; then
+			myconf="$myconf --with-pthreads"
+		fi
 	fi
 
-	# cd ${S}/src/unix || die "source directory not found"
 	econf \
 		--build=${CHOST} \
 		--enable-ffi \
 		--enable-profiling \
 		${myconf} || die "econf failed"
-	# cd ..
 	emake || die "make failed"
 }
 
@@ -81,9 +104,9 @@ src_install () {
 	make install DESTDIR="${D}" || die "make install failed"
 
 	#somewhat clean-up installation of few docs
-	cd ${S}
+	cd "${S}"
 	dodoc Credits License Readme
-	cd ${D}/usr/lib/hugs
+	cd "${D}/usr/lib/hugs"
 	rm Credits License Readme
-	mv demos/ docs/ ${D}/usr/share/doc/${PF}
+	mv demos/ docs/ "${D}/usr/share/doc/${PF}"
 }