Fixed installation paths. Added ~amd64 keyword.

Package-Manager: portage-2.0.51.19

4 files changed, 20 insertions, 23 deletions

diff --git a/dev-haskell/alex/ChangeLog b/dev-haskell/alex/ChangeLog
index 56bae6e409f8..ccbe449a14cf 100644
--- a/dev-haskell/alex/ChangeLog
+++ b/dev-haskell/alex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/alex
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/ChangeLog,v 1.10 2005/03/23 14:08:15 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/ChangeLog,v 1.11 2005/03/23 16:40:43 kosmikus Exp $
+
+*alex-2.0.1-r1 (23 Mar 2005)
+
+  23 Mar 2005; Andres Loeh <kosmikus@gentoo.org> +alex-2.0.1-r1.ebuild,
+  -alex-2.0.1.ebuild:
+  Fixed installation paths. Added ~amd64 keyword.
 
 *alex-2.0.1 (23 Mar 2005)
 
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 69cfe1bc32cf..8be373eaa883 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA1
 
 MD5 becc0aeac0301718ffdd85aefaf4d647 alex-2.0.ebuild 2185
-MD5 b2e1cda171e0b3839fcc0887b6d42a8b alex-2.0.1.ebuild 1784
-MD5 637e3cb68bc9e6e808f5e3280b2e48a1 ChangeLog 1199
+MD5 005c76aa75782d2dca55c9dd61537d86 alex-2.0.1-r1.ebuild 1581
+MD5 2659c191ecd8c0390b0f7de110fac390 ChangeLog 1374
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 382124e3a01f9c689abce012ade88a67 files/digest-alex-2.0 65
-MD5 630f9dad69d0e845886e2401d2db1c06 files/digest-alex-2.0.1 66
+MD5 630f9dad69d0e845886e2401d2db1c06 files/digest-alex-2.0.1-r1 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCQXl2OKSBj1ObwosRAlkTAJ9zzCO2USHykGcImwtI/c9M3xZdAACgnAyK
-f7T0/IMBYjsaGMw3PBxx8mM=
-=XNlH
+iD8DBQFCQZ0+OKSBj1ObwosRAo0wAJ41qIQyKgdMZY4Owx68C2WbnQd5MwCgnDva
+EpR/oO5BKjiIeTyYD0Vh/fQ=
+=vYel
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/alex/alex-2.0.1.ebuild b/dev-haskell/alex/alex-2.0.1-r1.ebuild
index 069ef3672ffa..98bd175cc495 100644
--- a/dev-haskell/alex/alex-2.0.1.ebuild
+++ b/dev-haskell/alex/alex-2.0.1-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-2.0.1.ebuild,v 1.1 2005/03/23 14:08:15 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-2.0.1-r1.ebuild,v 1.1 2005/03/23 16:40:43 kosmikus Exp $
 #
 # USE variable summary:
 #   doc	   - Build extra documenation from DocBook sources,
 #		in HTML format.
-#   tetex  - Build the above docs as PostScript as well.
+#   java   - Build the above docs as PostScript as well.
 
 
 inherit base eutils ghc-package
@@ -16,10 +16,10 @@ SRC_URI="http://www.haskell.org/alex/dist/${P}-src.tar.gz"
 HOMEPAGE="http://www.haskell.org/alex"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 LICENSE="as-is"
 
-DEPEND=">=virtual/ghc-6.2.2
+DEPEND=">=virtual/ghc-6.2
 	doc? (	~app-text/docbook-xml-dtd-4.2
 		app-text/docbook-xsl-stylesheets
 		>=dev-libs/libxslt-1.1.2
@@ -28,6 +28,7 @@ DEPEND=">=virtual/ghc-6.2.2
 RDEPEND=""
 
 src_compile() {
+	einfo "$(get_libdir)"
 	local mydoc
 	econf || die "econf failed"
 
@@ -57,19 +58,9 @@ src_install() {
 		datadir="${D}/usr/share/doc/${PF}" \
 		infodir="${D}/usr/share/info" \
 		mandir="${D}/usr/share/man" \
-		libdir0="${D}/usr/$(get-libdir)" \
+		libdir0="${D}/usr/$(get_libdir)" \
 		|| die "make ${insttarget} failed"
 
 	cd ${S}/haddock
-	dodoc CHANGES LICENSE README TODO
-
-	# if use doc; then
-	#	cd ${S}/alex/doc
-	#	dohtml -r alex/* || die
-	#	dosym alex.html /usr/share/doc/${PF}/html/index.html
-	#	if use tetex; then
-	#		docinto ps
-	#		dodoc alex.ps || die "dodoc failed"
-	#	fi
-	# fi
+	dodoc README
 }
diff --git a/dev-haskell/alex/files/digest-alex-2.0.1 b/dev-haskell/alex/files/digest-alex-2.0.1-r1
index 3deb93c568bf..3deb93c568bf 100644
--- a/dev-haskell/alex/files/digest-alex-2.0.1
+++ b/dev-haskell/alex/files/digest-alex-2.0.1-r1