[gentoo-commits] proj/sci:master commit in: sci-misc/sfst/

["Justin Lecher" <jlec@gentoo.org>]

commit:     f5548837cf53a7dd3c36741d2651560c6fbfdeb5
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 17:00:15 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 17:00:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f5548837

Cleaned ebuild

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-misc/sfst/ChangeLog         |    4 ++
 sci-misc/sfst/metadata.xml      |   12 +++---
 sci-misc/sfst/sfst-1.1.ebuild   |   75 -------------------------------------
 sci-misc/sfst/sfst-1.2.ebuild   |   77 --------------------------------------
 sci-misc/sfst/sfst-1.3.ebuild   |   78 ---------------------------------------
 sci-misc/sfst/sfst-1.4.2.ebuild |   37 +++++++++---------
 6 files changed, 29 insertions(+), 254 deletions(-)

diff --git a/sci-misc/sfst/ChangeLog b/sci-misc/sfst/ChangeLog
index f2e64ac..b9ed4f7 100644
--- a/sci-misc/sfst/ChangeLog
+++ b/sci-misc/sfst/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jun 2011; Justin Lecher <jlec@gentoo.org> -sfst-1.1.ebuild,
+  -sfst-1.2.ebuild, -sfst-1.3.ebuild, sfst-1.4.2.ebuild, metadata.xml:
+  Cleaned ebuild
+
 *sfst-1.4.2 (09 May 2011)
 
   09 May 2011; <flammie@gentoo.org> +sfst-1.4.2.ebuild:

diff --git a/sci-misc/sfst/metadata.xml b/sci-misc/sfst/metadata.xml
index 913dfd0..2ec953e 100644
--- a/sci-misc/sfst/metadata.xml
+++ b/sci-misc/sfst/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>flammie@gentoo.org</email>
-  <description>N.B. This is used in my master’s thesis project</description>
-</maintainer>
-<longdescription>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>flammie@gentoo.org</email>
+		<description>N.B. This is used in my master’s thesis project</description>
+	</maintainer>
+	<longdescription>
   SFST is open source package for compiling and using Finite State
   Transducers, mainly for linguistic uses, made in university of
   Stuttgart, Germany.

diff --git a/sci-misc/sfst/sfst-1.1.ebuild b/sci-misc/sfst/sfst-1.1.ebuild
deleted file mode 100644
index 5c6014f..0000000
--- a/sci-misc/sfst/sfst-1.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit elisp
-
-MY_PN="SFST"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Uni Stuttgart Finite State Transducer tools"
-HOMEPAGE="http://www.ims.uni-stuttgart.de/projekte/gramotron/SOFTWARE/SFST.html"
-SRC_URI="ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/${MY_P}.tar.gz
-vim-syntax? ( ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/vim-mode.tar.gz )
-emacs? ( http://www.cis.uni-muenchen.de/~wastl/emacs/sfst.el )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="emacs vim-syntax"
-
-DEPEND="sys-libs/readline
-sys-devel/bison
-sys-devel/flex
-sys-apps/sed"
-RDEPEND="sys-libs/readline"
-
-S="${WORKDIR}/${MY_PN}"
-
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's_/usr/local_$(destdir)/usr_g' -e 's/= install/= install -D/g' \
-		-e 's/^strip:/all:/g' -e 's/strip $(ALLPROGRAMS)/echo/g' \
-		-e "s/^CFLAGS = -O4 \(.*\)/CFLAGS = ${CFLAGS} \1/g" \
-		src/Makefile || die "sed failed"
-	if use emacs ; then
-		cp "${DISTDIR}/sfst.el" "${S}"
-	fi
-	if use vim-syntax ; then
-		mv "${WORKDIR}"/INSTALL "${S}"/INSTALL-vim-syntax
-		mv "${WORKDIR}"/sfst.vim "${S}"/
-	fi
-}
-
-src_compile() {
-	cd "${S}/src"
-	emake || die "make failed"
-	if use emacs ; then
-		cd "${S}"
-		elisp_src_compile
-	fi
-}
-
-src_install() {
-	cd "${S}/src"
-	emake destdir="${D}" install maninstall || die "install failed"
-	cd "${S}"
-	dodoc README || die "doc failed"
-	insinto /usr/share/doc/${PF}/
-	doins doc/SFST-Manual.pdf doc/SFST-Tutorial.pdf || die "doc failed"
-	insinto /usr/share/${PN}
-	doins -r data/*
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins sfst.vim
-		insinto /usr/share/vim/vimfiles/ftdetect/
-		newins "${FILESDIR}"/ftdetect-sfst.vim sfst.vim
-		dodoc INSTALL-vim-syntax
-	fi
-	if use emacs ; then
-		elisp_src_install
-	fi
-}
-

diff --git a/sci-misc/sfst/sfst-1.2.ebuild b/sci-misc/sfst/sfst-1.2.ebuild
deleted file mode 100644
index 67018b2..0000000
--- a/sci-misc/sfst/sfst-1.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit elisp
-
-MY_PN="SFST"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Uni Stuttgart Finite State Transducer tools"
-HOMEPAGE="http://www.ims.uni-stuttgart.de/projekte/gramotron/SOFTWARE/SFST.html"
-SRC_URI="ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/${MY_P}.tar.gz
-vim-syntax? ( ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/vim-mode.tar.gz )
-emacs? ( http://www.cis.uni-muenchen.de/~wastl/emacs/sfst.el )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="emacs vim-syntax"
-
-DEPEND="sys-libs/readline
-sys-devel/bison
-sys-devel/flex
-sys-apps/sed"
-RDEPEND="sys-libs/readline"
-
-S="${WORKDIR}/${MY_PN}"
-
-
-src_unpack() {
-	unpack ${A}
-	# settings in makefile are a bit hacky
-	sed -i -e "s/^CFLAGS = -O3/CFLAGS = ${CFLAGS}/g" \
-		-e "s/local//g" \
-		-e 's/strip/echo strip removed: /g' \
-		"${S}"/src/Makefile || die "sed failed"
-	cd "${S}"
-	if use emacs ; then
-		cp "${DISTDIR}/sfst.el" "${S}"
-	fi
-	if use vim-syntax ; then
-		mv "${WORKDIR}"/INSTALL "${S}"/INSTALL-vim-syntax
-		mv "${WORKDIR}"/sfst.vim "${S}"/
-	fi
-}
-
-src_compile() {
-	cd "${S}/src"
-	emake || die "make failed"
-	if use emacs ; then
-		cd "${S}"
-		elisp_src_compile
-	fi
-}
-
-src_install() {
-	cd "${S}/src"
-	# destdir works but prefix fails
-	emake DESTDIR="${D}" install maninstall || die "install failed"
-	cd "${S}"
-	dodoc README || die "doc failed"
-	insinto /usr/share/doc/${PF}/
-	doins doc/SFST-Manual.pdf doc/SFST-Tutorial.pdf || die "doc failed"
-	insinto /usr/share/${PN}
-	doins -r data/*
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins sfst.vim
-		insinto /usr/share/vim/vimfiles/ftdetect/
-		newins "${FILESDIR}"/ftdetect-sfst.vim sfst.vim
-		dodoc INSTALL-vim-syntax
-	fi
-	if use emacs ; then
-		elisp_src_install
-	fi
-}
-

diff --git a/sci-misc/sfst/sfst-1.3.ebuild b/sci-misc/sfst/sfst-1.3.ebuild
deleted file mode 100644
index 654cd1e..0000000
--- a/sci-misc/sfst/sfst-1.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit elisp eutils
-
-MY_PN="SFST"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Uni Stuttgart Finite State Transducer tools"
-HOMEPAGE="http://www.ims.uni-stuttgart.de/projekte/gramotron/SOFTWARE/SFST.html"
-SRC_URI="ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/${MY_P}.tar.gz
-vim-syntax? ( ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/vim-mode.tar.gz )
-emacs? ( http://www.cis.uni-muenchen.de/~wastl/emacs/sfst.el )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="emacs vim-syntax"
-
-DEPEND="sys-libs/readline
-sys-devel/bison
-sys-devel/flex
-sys-apps/sed"
-RDEPEND="sys-libs/readline"
-
-S="${WORKDIR}/${MY_PN}"
-
-
-src_unpack() {
-	unpack ${A}
-	# settings in makefile are a bit hacky
-	#epatch "${FILESDIR}"/SFST-1.3-gcc43.patch || die "patch failed"
-	sed -i -e "s/^CFLAGS = -O3/CFLAGS = ${CFLAGS}/g" \
-		-e "s/local//g" \
-		-e 's/strip/echo strip removed: /g' \
-		"${S}"/src/Makefile || die "sed failed"
-	cd "${S}"
-	if use emacs ; then
-		cp "${DISTDIR}/sfst.el" "${S}"
-	fi
-	if use vim-syntax ; then
-		mv "${WORKDIR}"/INSTALL "${S}"/INSTALL-vim-syntax
-		mv "${WORKDIR}"/sfst.vim "${S}"/
-	fi
-}
-
-src_compile() {
-	cd "${S}/src"
-	emake || die "make failed"
-	if use emacs ; then
-		cd "${S}"
-		elisp_src_compile
-	fi
-}
-
-src_install() {
-	cd "${S}/src"
-	# destdir works but prefix fails
-	emake DESTDIR="${D}" install maninstall || die "install failed"
-	cd "${S}"
-	dodoc README || die "doc failed"
-	insinto /usr/share/doc/${PF}/
-	doins doc/SFST-Manual.pdf doc/SFST-Tutorial.pdf || die "doc failed"
-	insinto /usr/share/${PN}
-	doins -r data/*
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins sfst.vim
-		insinto /usr/share/vim/vimfiles/ftdetect/
-		newins "${FILESDIR}"/ftdetect-sfst.vim sfst.vim
-		dodoc INSTALL-vim-syntax
-	fi
-	if use emacs ; then
-		elisp_src_install
-	fi
-}
-

diff --git a/sci-misc/sfst/sfst-1.4.2.ebuild b/sci-misc/sfst/sfst-1.4.2.ebuild
index f7c5aa7..73d5664 100644
--- a/sci-misc/sfst/sfst-1.4.2.ebuild
+++ b/sci-misc/sfst/sfst-1.4.2.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=4
+
 inherit elisp eutils
 
 MY_PN="SFST"
@@ -9,36 +11,37 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Uni Stuttgart Finite State Transducer tools"
 HOMEPAGE="http://www.ims.uni-stuttgart.de/projekte/gramotron/SOFTWARE/SFST.html"
-SRC_URI="ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/${MY_P}.tar.gz
-vim-syntax? ( ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/vim-mode.tar.gz )
-emacs? ( http://www.cis.uni-muenchen.de/~wastl/emacs/sfst.el )"
+SRC_URI="
+	ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/${MY_P}.tar.gz
+	vim-syntax? ( ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/vim-mode.tar.gz )
+	emacs? ( http://www.cis.uni-muenchen.de/~wastl/emacs/sfst.el )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="emacs vim-syntax"
 
-DEPEND="sys-libs/readline
-sys-devel/bison
-sys-devel/flex
-sys-apps/sed"
+DEPEND="
+	sys-libs/readline
+	sys-devel/bison
+	sys-devel/flex
+	sys-apps/sed"
 RDEPEND="sys-libs/readline"
 
 S="${WORKDIR}/${MY_PN}"
 
-
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	# settings in makefile are a bit hacky
 	#epatch "${FILESDIR}"/SFST-1.3-gcc43.patch || die "patch failed"
-	sed -i -e "s/^CFLAGS = -O3/CFLAGS = ${CFLAGS}/g" \
+	sed \
+		-e "s/^CFLAGS = -O3/CFLAGS = ${CFLAGS}/g" \
 		-e "s/local//g" \
 		-e 's/strip/echo strip removed: /g' \
 		-e 's/# FPIC/FPIC/' \
 		-e 's/ $(PREFIX/ $(DESTDIR)$(PREFIX/g' \
 		-e 's/ldconfig/true/' \
 		-e 's/$(INSTALL_LIBS)/$(INSTALL_DIR) $(DESTDIR)$(PREFIX)\/lib\n\t\0/' \
-		"${S}"/src/Makefile || die "sed failed"
+		-i "${S}"/src/Makefile || die "sed failed"
 	cd "${S}"
 	if use emacs ; then
 		cp "${DISTDIR}/sfst.el" "${S}"
@@ -50,8 +53,7 @@ src_unpack() {
 }
 
 src_compile() {
-	cd "${S}/src"
-	emake || die "make failed"
+	emake -C "${S}/src"
 	if use emacs ; then
 		cd "${S}"
 		elisp_src_compile
@@ -61,11 +63,11 @@ src_compile() {
 src_install() {
 	cd "${S}/src"
 	# destdir works but prefix fails
-	emake DESTDIR="${D}" install maninstall libinstall || die "install failed"
+	emake DESTDIR="${D}" install maninstall libinstall
 	cd "${S}"
-	dodoc README || die "doc failed"
+	dodoc README
 	insinto /usr/share/doc/${PF}/
-	doins doc/SFST-Manual.pdf doc/SFST-Tutorial.pdf || die "doc failed"
+	doins doc/SFST-Manual.pdf doc/SFST-Tutorial.pdf
 	insinto /usr/share/${PN}
 	doins -r data/*
 	if use vim-syntax ; then
@@ -79,4 +81,3 @@ src_install() {
 		elisp_src_install
 	fi
 }
-