From 8a00f96a51eb0552d88aa6a0f7bc18a1707ec86f Mon Sep 17 00:00:00 2001
From: Heath Caldwell <hncaldwell@gentoo.org>
Date: Tue, 10 Nov 2009 16:40:54 +0000
Subject: Make man pages install to proper location. Fixes bug #292616.
 (Portage version: 2.1.7.4/cvs/Linux x86_64)

---
 dev-lang/mlton/ChangeLog                | 10 +++++--
 dev-lang/mlton/mlton-20070826-r1.ebuild | 53 +++++++++++++++++++++++++++++++++
 dev-lang/mlton/mlton-20070826.ebuild    | 46 ----------------------------
 3 files changed, 61 insertions(+), 48 deletions(-)
 create mode 100644 dev-lang/mlton/mlton-20070826-r1.ebuild
 delete mode 100644 dev-lang/mlton/mlton-20070826.ebuild

(limited to 'dev-lang/mlton')

diff --git a/dev-lang/mlton/ChangeLog b/dev-lang/mlton/ChangeLog
index ecd671ba2d45..55e435d08edc 100644
--- a/dev-lang/mlton/ChangeLog
+++ b/dev-lang/mlton/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/mlton
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/ChangeLog,v 1.9 2009/03/22 17:01:52 hkbst Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/ChangeLog,v 1.10 2009/11/10 16:40:54 hncaldwell Exp $
+
+*mlton-20070826-r1 (10 Nov 2009)
+
+  10 Nov 2009; Heath Caldwell <hncaldwell@gentoo.org>
+  -mlton-20070826.ebuild, +mlton-20070826-r1.ebuild:
+  Make man pages install to proper location. Fixes bug #292616.
 
   22 Mar 2009; Marijn Schouten <hkBst@gentoo.org> -mlton-20040227.ebuild:
   rm old ebuild
diff --git a/dev-lang/mlton/mlton-20070826-r1.ebuild b/dev-lang/mlton/mlton-20070826-r1.ebuild
new file mode 100644
index 000000000000..53b3a5b3e1b6
--- /dev/null
+++ b/dev-lang/mlton/mlton-20070826-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/mlton-20070826-r1.ebuild,v 1.1 2009/11/10 16:40:54 hncaldwell Exp $
+
+inherit eutils
+
+DESCRIPTION="Standard ML optimizing compiler and libraries"
+BASE_URI="http://mlton.org/pages/Download/attachments/"
+SRC_URI="!binary? ( ${BASE_URI}/${P}-1.src.tgz )
+		  binary? ( amd64? ( ${BASE_URI}/${P}-1.amd64-linux.tgz )
+					x86?   ( ${BASE_URI}/${P}-1.x86-linux.tgz ) )"
+
+HOMEPAGE="http://www.mlton.org"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="binary doc"
+
+#block mlton-bin until it has been removed
+DEPEND="dev-libs/gmp
+		!dev-lang/mlton-bin
+		doc? ( virtual/latex-base )"
+
+src_compile() {
+	if use !binary; then
+		has_version dev-lang/mlton || die "emerge with binary use flag first"
+
+		# Fix location in which to install man pages
+		sed -i 's@^MAN_PREFIX_EXTRA :=.*@MAN_PREFIX_EXTRA := /share@' \
+			Makefile || die 'sed Makefile failed'
+
+		# Does not support parallel make
+		emake -j1 all-no-docs || die
+		if use doc; then
+			export VARTEXFONTS="${T}/fonts"
+			emake docs || die "failed to create documentation"
+		fi
+	fi
+}
+
+src_install() {
+	if use binary; then
+		# Fix location in which to install man pages
+		mv "${WORKDIR}/usr/man" "${WORKDIR}/usr/share" || die "mv man failed"
+
+		mv "${WORKDIR}/usr" "${D}" || die "mv failed"
+	else
+		emake DESTDIR="${D}" install-no-docs || die
+		if use doc; then emake DESTDIR="${D}" TDOC="${D}"/usr/share/doc/${P} install-docs || die; fi
+	fi
+}
diff --git a/dev-lang/mlton/mlton-20070826.ebuild b/dev-lang/mlton/mlton-20070826.ebuild
deleted file mode 100644
index eb0b7e1aaef6..000000000000
--- a/dev-lang/mlton/mlton-20070826.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/mlton-20070826.ebuild,v 1.2 2008/08/06 14:50:56 aballier Exp $
-
-inherit eutils
-
-DESCRIPTION="Standard ML optimizing compiler and libraries"
-BASE_URI="http://mlton.org/pages/Download/attachments/"
-SRC_URI="!binary? ( ${BASE_URI}/${P}-1.src.tgz )
-		  binary? ( amd64? ( ${BASE_URI}/${P}-1.amd64-linux.tgz )
-					x86?   ( ${BASE_URI}/${P}-1.x86-linux.tgz ) )"
-
-HOMEPAGE="http://www.mlton.org"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE="binary doc"
-
-#block mlton-bin until it has been removed
-DEPEND="dev-libs/gmp
-		!dev-lang/mlton-bin
-		doc? ( virtual/latex-base )"
-
-src_compile() {
-	if use !binary; then
-		has_version dev-lang/mlton || die "emerge with binary use flag first"
-
-		# Does not support parallel make
-		emake -j1 all-no-docs || die
-		if use doc; then
-			export VARTEXFONTS="${T}/fonts"
-			emake docs || die "failed to create documentation"
-		fi
-	fi
-}
-
-src_install() {
-	if use binary; then
-		mv "${WORKDIR}/usr" "${D}"
-	else
-		emake DESTDIR="${D}" install-no-docs || die
-		if use doc; then emake DESTDIR="${D}" TDOC="${D}"/usr/share/doc/${P} install-docs || die; fi
-	fi
-}
-- 
cgit v1.2.3-65-gdbad