Version bump

(Portage version: 2.1.10.7/cvs/Linux x86_64)

4 files changed, 151 insertions, 2 deletions

diff --git a/sci-misc/apertium/ChangeLog b/sci-misc/apertium/ChangeLog
index b4ebae7789f5..0bec5343f456 100644
--- a/sci-misc/apertium/ChangeLog
+++ b/sci-misc/apertium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-misc/apertium
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/ChangeLog,v 1.3 2009/08/23 12:25:51 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/ChangeLog,v 1.4 2011/07/29 06:13:10 bicatali Exp $
+
+*apertium-3.2.0 (29 Jul 2011)
+
+  29 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/3.2.0-datadir.patch, +files/3.2.0-flags.patch, +apertium-3.2.0.ebuild:
+  Version bump
 
   23 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   apertium-3.1.0.ebuild:
diff --git a/sci-misc/apertium/apertium-3.2.0.ebuild b/sci-misc/apertium/apertium-3.2.0.ebuild
new file mode 100644
index 000000000000..b5f4c1625cb1
--- /dev/null
+++ b/sci-misc/apertium/apertium-3.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/apertium-3.2.0.ebuild,v 1.1 2011/07/29 06:13:10 bicatali Exp $
+
+EAPI=4
+inherit eutils autotools
+
+DESCRIPTION="Shallow-transfer machine Translation engine and toolbox"
+HOMEPAGE="http://apertium.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="virtual/libiconv
+	dev-libs/libxslt
+	dev-libs/libpcre[cxx]
+	>=sci-misc/lttoolbox-3.2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-flags.patch
+	epatch "${FILESDIR}"/${PV}-datadir.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	# nasty to fix, be my guest, see apertium/Makefile.am
+	emake -j1
+}
diff --git a/sci-misc/apertium/files/3.2.0-datadir.patch b/sci-misc/apertium/files/3.2.0-datadir.patch
new file mode 100644
index 000000000000..d081cd50bc79
--- /dev/null
+++ b/sci-misc/apertium/files/3.2.0-datadir.patch
@@ -0,0 +1,35 @@
+diff -Nur apertium-3.2.0.orig/apertium/Makefile.am apertium-3.2.0/apertium/Makefile.am
+--- apertium-3.2.0.orig/apertium/Makefile.am	2011-07-29 06:55:49.000000000 +0100
++++ apertium-3.2.0/apertium/Makefile.am	2011-07-29 07:03:58.000000000 +0100
+@@ -66,10 +66,10 @@
+ 
+ instdir = apertium
+ 
+-apertiumdir = $(prefix)/share/apertium
++apertiumdir = $(datadir)/
+ apertiuminclude = $(prefix)/include/apertium-$(GENERIC_API_VERSION)
+ apertiumlib = $(prefix)/lib 
+-apertiumsysconf = $(prefix)/etc/apertium
++apertiumsysconf = $(sysconfdir)/apertium
+ 
+ apertium_DATA = deformat.xsl reformat.xsl new2old.xsl lexchoice.xsl \
+                 lexchoicebil.xsl tagger.dtd interchunk.dtd format.dtd \
+diff -Nur apertium-3.2.0.orig/Makefile.am apertium-3.2.0/Makefile.am
+--- apertium-3.2.0.orig/Makefile.am	2011-07-29 06:55:49.000000000 +0100
++++ apertium-3.2.0/Makefile.am	2011-07-29 07:08:39.000000000 +0100
+@@ -1,13 +1,10 @@
+ SUBDIRS = $(GENERIC_LIBRARY_NAME)
+ DIST_SUBDIRS = $(GENERIC_LIBRARY_NAME)
+ 
+-modesdir=$(prefix)/share/apertium/modes
++modesdir = $(datadir)/apertium/modes
++modes_DATA = README-MODES
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = apertium-$(GENERIC_RELEASE).pc
+ 
+ EXTRA_DIST=autogen.sh README-MODES
+-
+-install-data-local:
+-	mkdir -p $(modesdir)
+-	$(INSTALL_DATA) README-MODES  $(modesdir)/README
diff --git a/sci-misc/apertium/files/3.2.0-flags.patch b/sci-misc/apertium/files/3.2.0-flags.patch
new file mode 100644
index 000000000000..9bdc4a34c117
--- /dev/null
+++ b/sci-misc/apertium/files/3.2.0-flags.patch
@@ -0,0 +1,72 @@
+diff -Nur apertium-3.2.0.orig/configure.ac apertium-3.2.0/configure.ac
+--- apertium-3.2.0.orig/configure.ac	2011-07-29 06:43:38.000000000 +0100
++++ apertium-3.2.0/configure.ac	2011-07-29 06:46:26.000000000 +0100
+@@ -54,68 +54,6 @@
+ 
+ # Checks for programs.
+ 
+-AC_MSG_CHECKING([Compilation architecture: PPC, i686, x86_64, Other])
+-if test x$(which arch) = x
+-then ARCH=$($(which uname) -m)
+-else ARCH=$($(which arch))
+-fi
+-
+-case "${target_os}" in
+-  mingw*)
+-    MinGW=yes
+-  ;;
+-  cygwin*)
+-    Cygwin=yes
+-  ;;
+-esac
+-
+-if test x$ARCH = xppc
+-then
+-  AC_MSG_RESULT([PowerPC])
+-  CFLAGS="$CFLAGS -Wall -ansi -fomit-frame-pointer"
+-  CXXFLAGS="$CXXFLAGS -Wall -ansi -fomit-frame-pointer"
+-else
+-  if test x$MinGW = xyes
+-  then 
+-    AC_MSG_RESULT([MinGW])
+-    CFLAGS="$CFLAGS -Wall -march=i686 -O3 -DMINGW -fomit-frame-pointer \
+-	        -funroll-loops -I/include -L/lib"
+-    CXXFLAGS="$CXXFLAGS -Wall -march=i686 -O3 \
+-            -fomit-frame-pointer -funroll-loops -I/include -L/lib"
+-    CPPFLAGS="$CPPFLAGS -I/include"
+-  else
+-    if test x$Cygwin = xyes
+-    then 
+-      AC_MSG_RESULT([Cygwin])
+-      CFLAGS="$CFLAGS -Wall -march=i686 -O3 -fomit-frame-pointer \
+-           -funroll-loops"
+-      CXXFLAGS="$CXXFLAGS -Wall -march=i686 -O3 \
+-              -fomit-frame-pointer -funroll-loops"
+-      CPPFLAGS="$CPPFLAGS"
+-    else
+-      if test x$ARCH = xi686
+-      then
+-        AC_MSG_RESULT([i686])
+-        CFLAGS="$CFLAGS -Wall -ansi -march=i686 -O3 -fomit-frame-pointer -funroll-loops"
+-        CXXFLAGS="$CXXFLAGS -Wall -ansi -march=i686 -O3 \
+-                -fomit-frame-pointer -funroll-loops"
+-      else
+-        if test x$ARCH = xx86_64
+-        then
+-          AC_MSG_RESULT([x86_64])
+-          CFLAGS="-Wall -ansi -O3 -mtune=nocona -fomit-frame-pointer -funroll-loops $CFLAGS"
+-          CXXFLAGS="-Wall -ansi -O3 -mtune=nocona \
+-                  -fomit-frame-pointer -funroll-loops $CXXFLAGS"
+-        else
+-          AC_MSG_RESULT([Other])
+-          CFLAGS="-Wall -ansi -O3 $CFLAGS"
+-          CXXFLAGS="-Wall -ansi -O3 $CXXFLAGS"
+-        fi
+-      fi
+-    fi    
+-  fi
+-fi
+-
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+ AM_SANITY_CHECK