Version bump; make python support optional

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0B08240A96F66571)

5 files changed, 99 insertions, 14 deletions

diff --git a/dev-libs/libixion/ChangeLog b/dev-libs/libixion/ChangeLog
index 38fe37f66d38..dfa5bd002911 100644
--- a/dev-libs/libixion/ChangeLog
+++ b/dev-libs/libixion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libixion
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libixion/ChangeLog,v 1.22 2015/05/27 10:58:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libixion/ChangeLog,v 1.23 2015/06/21 15:35:49 dilfridge Exp $
+
+  21 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/libixion-0.9.1-python-optional.patch, +files/libixion-0.9.1-typo.patch,
+  libixion-0.9.1.ebuild, libixion-9999.ebuild:
+  Version bump; make python support optional
 
   27 May 2015; Agostino Sarubbo <ago@gentoo.org> libixion-0.9.0.ebuild:
   Stable for x86, wrt bug #547900
diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
new file mode 100644
index 000000000000..a4e7239568a2
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
@@ -0,0 +1,56 @@
+commit 59c360c9fe438a2805d65decc6c7889bc99a7747
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun May 31 10:14:17 2015 +0200
+
+    python: Make it optional
+    
+    python bindings are built unless disabled
+
+diff --git a/configure.ac b/configure.ac
+index 03f6120..1c7d8b2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,7 +15,6 @@ AC_PREREQ([2.63])
+ AC_INIT([libixion], [ixion_version])
+ AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz])
+-AM_PATH_PYTHON(2.7.0)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+ AC_ARG_WITH(hash-container-compat,
+@@ -28,6 +27,9 @@ AC_ARG_WITH(mdds-include-path,
+     AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.])
+ ,)
+ 
++AC_ARG_ENABLE([python],
++    AS_HELP_STRING([--disable-python], [Disable python bindings]))
++
+ IXION_API_VERSION=ixion_api_version
+ IXION_MAJOR_VERSION=ixion_major_version
+ IXION_MINOR_VERSION=ixion_minor_version
+@@ -82,7 +84,11 @@ fi
+ PKG_CHECK_MODULES([MDDS],[mdds >= 0.12.0])
+ 
+ # Check for python.
+-PKG_CHECK_MODULES([PYTHON], [python >= 0.27.1])
++AS_IF([test "x$enable_python" != "xno"], [
++    AM_PATH_PYTHON(2.7.0)
++    PKG_CHECK_MODULES([PYTHON], [python >= 0.27.1])
++])
++AM_CONDITIONAL([PYTHON], [test "x$enable_python" != "xno"])
+ 
+ CPPFLAGS="$CPPFLAGS -g -Os -fvisibility=hidden"
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6e138a4..cd912ab 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,7 @@
+-SUBDIRS = libixion python
++SUBDIRS = libixion
++if PYTHON
++	SUBDIRS += python
++endif
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/include $(MDDS_CFLAGS)
+ 
diff --git a/dev-libs/libixion/files/libixion-0.9.1-typo.patch b/dev-libs/libixion/files/libixion-0.9.1-typo.patch
new file mode 100644
index 000000000000..7e41f7bb752f
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.9.1-typo.patch
@@ -0,0 +1,18 @@
+commit ceddf45ed98dd0b65b510a284d373630c7642587
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun May 31 11:55:08 2015 +0200
+
+    src/Makefile.am: Fix typo
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ee9a1cc..b28c610 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -28,6 +28,6 @@ ixion_sorter_SOURCES = \
+ ixion_sorter_LDADD = libixion/libixion-@IXION_API_VERSION@.la \
+ 					 $(BOOST_THREAD_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS)
+ 
+-AM_TESTS_ENVIRONMENT = PATH=.libs$${PATH:+:$${PATH}}; epxort PATH; \
++AM_TESTS_ENVIRONMENT = PATH=.libs$${PATH:+:$${PATH}}; export PATH; \
+ 	LD_LIBRARY_PATH=libixion/.libs$${LD_LIBRARY_PATH:+:$${LD_LIBRARY_PATH}}; export LD_LIBRARY_PATH;
+ TESTS = ../test/ixion-parser-test.sh
diff --git a/dev-libs/libixion/libixion-0.9.1.ebuild b/dev-libs/libixion/libixion-0.9.1.ebuild
index 3a2fb8aea778..798f31b47ed2 100644
--- a/dev-libs/libixion/libixion-0.9.1.ebuild
+++ b/dev-libs/libixion/libixion-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libixion/libixion-0.9.1.ebuild,v 1.1 2015/05/22 23:03:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libixion/libixion-0.9.1.ebuild,v 1.2 2015/06/21 15:35:49 dilfridge Exp $
 
 EAPI=5
 
@@ -8,8 +8,8 @@ EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
 
 PYTHON_COMPAT=( python2_7 )
 
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit eutils python-single-r1 ${GITECLASS}
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3"
+inherit autotools eutils python-single-r1 ${GITECLASS}
 unset GITECLASS
 
 DESCRIPTION="General purpose formula parser & interpreter"
@@ -20,23 +20,27 @@ LICENSE="MIT"
 SLOT="0/0.10"
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="static-libs"
+IUSE="python static-libs"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
 	dev-libs/boost:=
+	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/mdds-0.12.0:=
 "
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
+	epatch "${FILESDIR}/${PN}-0.9.1-typo.patch"
+	epatch "${FILESDIR}/${PN}-0.9.1-python-optional.patch"
+	eautoreconf
 }
 
 src_configure() {
 	econf \
+		$(use_enable python) \
 		$(use_enable static-libs static)
 }
 
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index aae5f2a95d53..87aaba710d15 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libixion/libixion-9999.ebuild,v 1.13 2015/04/06 11:42:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libixion/libixion-9999.ebuild,v 1.14 2015/06/21 15:35:49 dilfridge Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python{3_3,3_4} )
 
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
 inherit eutils python-single-r1 ${GITECLASS}
@@ -17,19 +17,20 @@ HOMEPAGE="https://gitlab.com/ixion/ixion"
 [[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.xz"
 
 LICENSE="MIT"
-SLOT="0/0.10"
+SLOT="0/0.12"
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="static-libs"
+IUSE="python static-libs"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
 	dev-libs/boost:=
+	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/mdds-0.12.0:=
 "
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 src_prepare() {
 	[[ ${PV} == 9999 ]] && eautoreconf
@@ -37,6 +38,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		$(use_enable python) \
 		$(use_enable static-libs static)
 }