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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sci-misc/sfst/
@ 2017-02-28 20:05 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2017-02-28 20:05 UTC (permalink / raw
  To: gentoo-commits

commit:     835699abd326bf7291ec22f8281f5d47bd519932
Author:     Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Mon Feb 27 09:21:26 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 09:21:26 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=835699ab

sci-misc/sfst: Version bump (#740)

Bump to EAPI 6
Update HOMEPAGE and SRC_URI

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-misc/sfst/sfst-1.4.7d.ebuild | 83 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/sci-misc/sfst/sfst-1.4.7d.ebuild b/sci-misc/sfst/sfst-1.4.7d.ebuild
new file mode 100644
index 000000000..c0210963f
--- /dev/null
+++ b/sci-misc/sfst/sfst-1.4.7d.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp-common eutils
+
+MY_PN="SFST"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Uni Stuttgart Finite State Transducer tools"
+HOMEPAGE="http://www.cis.uni-muenchen.de/~schmid/tools/SFST/"
+SRC_URI="
+	http://www.cis.uni-muenchen.de/~schmid/tools/${MY_PN}/data/${MY_P}.tar.gz
+	vim-syntax? ( http://www.cis.uni-muenchen.de/~schmid/tools/${MY_PN}/data/vim-mode.tar.gz )
+	emacs? ( http://www.cis.uni-muenchen.de/~wastl/emacs/sfst.el )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs vim-syntax"
+
+RDEPEND="
+	sys-libs/readline:0=
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+	# settings in makefile are a bit hacky
+	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/' \
+		-i "${S}"/src/Makefile || die "sed failed"
+	cd "${S}" || die
+	if use emacs ; then
+		cp "${DISTDIR}/sfst.el" "${S}" || die
+	fi
+	if use vim-syntax ; then
+		mv "${WORKDIR}"/INSTALL "${S}"/INSTALL-vim-syntax || die
+		mv "${WORKDIR}"/sfst.vim "${S}"/ || die
+	fi
+
+	eapply_user
+}
+
+src_compile() {
+	emake -C "${S}/src"
+	if use emacs ; then
+		cd "${S}" || die
+		elisp-compile *.el || die "could not compile elisp"
+	fi
+}
+
+src_install() {
+	cd "${S}/src" || die
+	# destdir works but prefix fails
+	emake DESTDIR="${D}" install maninstall libinstall
+	cd "${S}" || die
+	dodoc README
+	insinto /usr/share/doc/${PF}/
+	doins doc/SFST-Manual.pdf doc/SFST-Tutorial.pdf
+	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-install ${PN} *.el *.elc
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-misc/sfst/
@ 2012-08-01  0:49 Flammie Pirinen
  0 siblings, 0 replies; 7+ messages in thread
From: Flammie Pirinen @ 2012-08-01  0:49 UTC (permalink / raw
  To: gentoo-commits

commit:     7b2f61c42b449e1a5f1b3388bd9740d6d214ba74
Author:     Flammie Pirinen <flammie <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  1 00:44:54 2012 +0000
Commit:     Flammie Pirinen <flammie <AT> gentoo <DOT> org>
CommitDate: Wed Aug  1 00:44:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7b2f61c4

Version bump sfst to 1.4.6g

(Portage version: 2.1.10.65/git/Linux i686, unsigned Manifest commit)

---
 sci-misc/sfst/ChangeLog          |    7 +++-
 sci-misc/sfst/sfst-1.4.6g.ebuild |   83 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 1 deletions(-)

diff --git a/sci-misc/sfst/ChangeLog b/sci-misc/sfst/ChangeLog
index 127bdf9..ac6a40d 100644
--- a/sci-misc/sfst/ChangeLog
+++ b/sci-misc/sfst/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-misc/sfst
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sfst-1.4.6g (01 Aug 2012)
+
+  01 Aug 2012; Flammie Pirinen <flammie@gentoo.org> +sfst-1.4.6g.ebuild:
+  Version bump sfst to 1.4.6g.
+
   24 Oct 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Removed no-herd from herd tag in metadata.xml
 

diff --git a/sci-misc/sfst/sfst-1.4.6g.ebuild b/sci-misc/sfst/sfst-1.4.6g.ebuild
new file mode 100644
index 0000000..6222fdd
--- /dev/null
+++ b/sci-misc/sfst/sfst-1.4.6g.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit elisp-common 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="~x86"
+IUSE="emacs vim-syntax"
+
+RDEPEND="sys-libs/readline"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	sys-apps/sed
+	emacs? ( virtual/emacs )"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+	# settings in makefile are a bit hacky
+	#epatch "${FILESDIR}"/SFST-1.3-gcc43.patch || die "patch failed"
+	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/' \
+		-i "${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() {
+	emake -C "${S}/src"
+	if use emacs ; then
+		cd "${S}"
+		elisp-compile *.el || die "could not compile elisp"
+	fi
+}
+
+src_install() {
+	cd "${S}/src"
+	# destdir works but prefix fails
+	emake DESTDIR="${D}" install maninstall libinstall
+	cd "${S}"
+	dodoc README
+	insinto /usr/share/doc/${PF}/
+	doins doc/SFST-Manual.pdf doc/SFST-Tutorial.pdf
+	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-install ${PN} *.el *.elc || die "could not install elisp"
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-misc/sfst/
@ 2011-10-24 19:12 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2011-10-24 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     6fe4360207fd225adbfba8bdf31b1126f28bb61a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 19:07:47 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 19:07:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6fe43602

Removed no-herd from herd tag in metadata.xml

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

---
 sci-misc/sfst/ChangeLog    |    3 +++
 sci-misc/sfst/metadata.xml |    1 -
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/sci-misc/sfst/ChangeLog b/sci-misc/sfst/ChangeLog
index b9ed4f7..127bdf9 100644
--- a/sci-misc/sfst/ChangeLog
+++ b/sci-misc/sfst/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Oct 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Removed no-herd from herd tag in metadata.xml
+
   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

diff --git a/sci-misc/sfst/metadata.xml b/sci-misc/sfst/metadata.xml
index 2ec953e..8bea851 100644
--- a/sci-misc/sfst/metadata.xml
+++ b/sci-misc/sfst/metadata.xml
@@ -1,7 +1,6 @@
 <?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>



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-misc/sfst/
@ 2011-06-25 17:22 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2011-06-25 17:22 UTC (permalink / raw
  To: gentoo-commits

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
 }
-



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-misc/sfst/
@ 2011-06-24 17:09 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     9c7dd0f34886a59950de132ac4c21a82ce4dbe98
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 15:28:49 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 15:28:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9c7dd0f3

Sort inherit and/or USE

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

---
 sci-misc/sfst/sfst-1.1.ebuild   |    2 +-
 sci-misc/sfst/sfst-1.2.ebuild   |    2 +-
 sci-misc/sfst/sfst-1.3.ebuild   |    4 ++--
 sci-misc/sfst/sfst-1.4.2.ebuild |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-misc/sfst/sfst-1.1.ebuild b/sci-misc/sfst/sfst-1.1.ebuild
index f33fb36..5c6014f 100644
--- a/sci-misc/sfst/sfst-1.1.ebuild
+++ b/sci-misc/sfst/sfst-1.1.ebuild
@@ -16,7 +16,7 @@ emacs? ( http://www.cis.uni-muenchen.de/~wastl/emacs/sfst.el )"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="vim-syntax emacs"
+IUSE="emacs vim-syntax"
 
 DEPEND="sys-libs/readline
 sys-devel/bison

diff --git a/sci-misc/sfst/sfst-1.2.ebuild b/sci-misc/sfst/sfst-1.2.ebuild
index 8ea3ac5..67018b2 100644
--- a/sci-misc/sfst/sfst-1.2.ebuild
+++ b/sci-misc/sfst/sfst-1.2.ebuild
@@ -16,7 +16,7 @@ emacs? ( http://www.cis.uni-muenchen.de/~wastl/emacs/sfst.el )"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="vim-syntax emacs"
+IUSE="emacs vim-syntax"
 
 DEPEND="sys-libs/readline
 sys-devel/bison

diff --git a/sci-misc/sfst/sfst-1.3.ebuild b/sci-misc/sfst/sfst-1.3.ebuild
index df0fa57..654cd1e 100644
--- a/sci-misc/sfst/sfst-1.3.ebuild
+++ b/sci-misc/sfst/sfst-1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils elisp
+inherit elisp eutils
 
 MY_PN="SFST"
 MY_P="${MY_PN}-${PV}"
@@ -16,7 +16,7 @@ emacs? ( http://www.cis.uni-muenchen.de/~wastl/emacs/sfst.el )"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="vim-syntax emacs"
+IUSE="emacs vim-syntax"
 
 DEPEND="sys-libs/readline
 sys-devel/bison

diff --git a/sci-misc/sfst/sfst-1.4.2.ebuild b/sci-misc/sfst/sfst-1.4.2.ebuild
index e74fa6d..f7c5aa7 100644
--- a/sci-misc/sfst/sfst-1.4.2.ebuild
+++ b/sci-misc/sfst/sfst-1.4.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils elisp
+inherit elisp eutils
 
 MY_PN="SFST"
 MY_P="${MY_PN}-${PV}"
@@ -16,7 +16,7 @@ emacs? ( http://www.cis.uni-muenchen.de/~wastl/emacs/sfst.el )"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="vim-syntax emacs"
+IUSE="emacs vim-syntax"
 
 DEPEND="sys-libs/readline
 sys-devel/bison



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-misc/sfst/
@ 2011-05-09 17:54 Flammie Pirinen
  0 siblings, 0 replies; 7+ messages in thread
From: Flammie Pirinen @ 2011-05-09 17:54 UTC (permalink / raw
  To: gentoo-commits

commit:     b6437a59484aa16218dacc267683b0c2ad809fe3
Author:     Flammie Pirinen <flammie <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 17:53:04 2011 +0000
Commit:     Flammie Pirinen <flammie <AT> gentoo <DOT> org>
CommitDate: Mon May  9 17:53:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b6437a59

Remove file with missing download.

---
 sci-misc/sfst/ChangeLog       |    5 ++-
 sci-misc/sfst/sfst-1.4.ebuild |   78 -----------------------------------------
 2 files changed, 4 insertions(+), 79 deletions(-)

diff --git a/sci-misc/sfst/ChangeLog b/sci-misc/sfst/ChangeLog
index 7f03467..e4f4c67 100644
--- a/sci-misc/sfst/ChangeLog
+++ b/sci-misc/sfst/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-misc/sfst
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 May 2011; <flammie@gentoo.org> -sfst-1.4.ebuild:
+  Remove ebuild with missing download.
+
 *sfst-1.4 (28 Oct 2010)
 
   28 Oct 2010; <flammie@gentoo.org> +sfst-1.4.ebuild:

diff --git a/sci-misc/sfst/sfst-1.4.ebuild b/sci-misc/sfst/sfst-1.4.ebuild
deleted file mode 100644
index a2b4339..0000000
--- a/sci-misc/sfst/sfst-1.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils 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="vim-syntax emacs"
-
-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, lib fails
-	emake DESTDIR="${D}" install maninstall || die "install failed"
-	emake libsfst.so || die "make lib failed"
-	dolib.so libsfst.so || die "install lib 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
-}



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-misc/sfst/
@ 2011-05-09 17:54 Flammie Pirinen
  0 siblings, 0 replies; 7+ messages in thread
From: Flammie Pirinen @ 2011-05-09 17:54 UTC (permalink / raw
  To: gentoo-commits

commit:     70c3adb4fcc9aafacf05b58f52b03b9ad60dfde1
Author:     Flammie Pirinen <flammie <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 17:54:25 2011 +0000
Commit:     Flammie Pirinen <flammie <AT> gentoo <DOT> org>
CommitDate: Mon May  9 17:54:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=70c3adb4

Version bu,p

---
 sci-misc/sfst/ChangeLog         |    5 ++
 sci-misc/sfst/sfst-1.4.2.ebuild |   82 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 0 deletions(-)

diff --git a/sci-misc/sfst/ChangeLog b/sci-misc/sfst/ChangeLog
index e4f4c67..f2e64ac 100644
--- a/sci-misc/sfst/ChangeLog
+++ b/sci-misc/sfst/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sfst-1.4.2 (09 May 2011)
+
+  09 May 2011; <flammie@gentoo.org> +sfst-1.4.2.ebuild:
+  Version bump.
+
   09 May 2011; <flammie@gentoo.org> -sfst-1.4.ebuild:
   Remove ebuild with missing download.
 

diff --git a/sci-misc/sfst/sfst-1.4.2.ebuild b/sci-misc/sfst/sfst-1.4.2.ebuild
new file mode 100644
index 0000000..e74fa6d
--- /dev/null
+++ b/sci-misc/sfst/sfst-1.4.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils 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="vim-syntax emacs"
+
+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' \
+		-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"
+	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 libinstall || 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
+}
+



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2017-02-28 20:06 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-28 20:05 [gentoo-commits] proj/sci:master commit in: sci-misc/sfst/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2012-08-01  0:49 Flammie Pirinen
2011-10-24 19:12 Justin Lecher
2011-06-25 17:22 Justin Lecher
2011-06-24 17:09 Justin Lecher
2011-05-09 17:54 Flammie Pirinen
2011-05-09 17:54 Flammie Pirinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox