commit: a8ca444b5c267f52cbdd3eae6946ac4de3eea739
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Feb 6 17:25:49 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 17:05:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ca444b
dev-libs/liborcus: Add USE=spreadsheet-model,tools (bugs 571964, 571966)
Further changes:
EAPI=6
0.7.1 and 0.9.2 - pin required mdds slot 0 and liborcus version
9999 - pin required mdds slot 1
Package-Manager: portage-2.2.27
...liborcus-0.7.1.ebuild => liborcus-0.7.1-r1.ebuild} | 19 +++++++++++--------
dev-libs/liborcus/liborcus-0.7.1.ebuild | 6 +++---
...liborcus-0.9.2.ebuild => liborcus-0.9.2-r1.ebuild} | 17 ++++++++++-------
dev-libs/liborcus/liborcus-9999.ebuild | 8 +++++---
dev-libs/liborcus/metadata.xml | 7 +++++++
5 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/dev-libs/liborcus/liborcus-0.7.1.ebuild
b/dev-libs/liborcus/liborcus-0.7.1-r1.ebuild
similarity index 64%
copy from dev-libs/liborcus/liborcus-0.7.1.ebuild
copy to dev-libs/liborcus/liborcus-0.7.1-r1.ebuild
index 7c68d4c..3612205 100644
--- a/dev-libs/liborcus/liborcus-0.7.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.7.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
EGIT_REPO_URI="git://gitlab.com/orcus/orcus.git"
-[[ ${PV} == 9999 ]] && GITECLASS="git-2 autotools"
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
inherit eutils ${GITECLASS}
unset GITECLASS
@@ -17,27 +17,30 @@ HOMEPAGE="https://gitlab.com/orcus/orcus";
LICENSE="MIT"
SLOT="0"
[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="static-libs"
+IUSE="+spreadsheet-model static-libs tools"
RDEPEND="
>=dev-libs/boost-1.51.0:=
- >=dev-libs/libixion-0.9:=
sys-libs/zlib:=
+ spreadsheet-model? ( =dev-libs/libixion-0.9*:= )
"
DEPEND="${RDEPEND}
- >=dev-util/mdds-0.8.1
+ >=dev-util/mdds-0.8.1:0
"
src_prepare() {
+ eapply_user
[[ ${PV} == 9999 ]] && eautoreconf
}
src_configure() {
econf \
--disable-werror \
- $(use_enable static-libs static)
+ $(use_enable spreadsheet-model) \
+ $(use_enable static-libs static) \
+ $(use_with tools)
}
src_install() {
diff --git a/dev-libs/liborcus/liborcus-0.7.1.ebuild
b/dev-libs/liborcus/liborcus-0.7.1.ebuild
index 7c68d4c..87cbf36 100644
--- a/dev-libs/liborcus/liborcus-0.7.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -23,11 +23,11 @@ IUSE="static-libs"
RDEPEND="
>=dev-libs/boost-1.51.0:=
- >=dev-libs/libixion-0.9:=
+ =dev-libs/libixion-0.9*:=
sys-libs/zlib:=
"
DEPEND="${RDEPEND}
- >=dev-util/mdds-0.8.1
+ >=dev-util/mdds-0.8.1:0
"
src_prepare() {
diff --git a/dev-libs/liborcus/liborcus-0.9.2.ebuild
b/dev-libs/liborcus/liborcus-0.9.2-r1.ebuild
similarity index 70%
rename from dev-libs/liborcus/liborcus-0.9.2.ebuild
rename to dev-libs/liborcus/liborcus-0.9.2-r1.ebuild
index 6668627..8a6c9f2 100644
--- a/dev-libs/liborcus/liborcus-0.9.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.9.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git";
@@ -15,31 +15,34 @@
HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md";
[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.xz";
LICENSE="MIT"
-SLOT="0/0.10"
+SLOT="0/0.10" # based on SONAME of liborcus.so
#[[ ${PV} == 9999 ]] || \
#KEYWORDS="~amd64 ~arm ~ppc ~x86"
KEYWORDS=""
-IUSE="static-libs"
+IUSE="+spreadsheet-model static-libs tools"
RDEPEND="
>=dev-libs/boost-1.51.0:=
- =dev-libs/libixion-0.9*:=
sys-libs/zlib:=
+ spreadsheet-model? ( =dev-libs/libixion-0.9*:= )
"
DEPEND="${RDEPEND}
- >=dev-util/mdds-0.11
+ >=dev-util/mdds-0.11:0
"
src_prepare() {
+ eapply_user
[[ ${PV} == 9999 ]] && eautoreconf
}
src_configure() {
econf \
--disable-werror \
- $(use_enable static-libs static)
+ $(use_enable spreadsheet-model) \
+ $(use_enable static-libs static) \
+ $(use_with tools)
}
src_install() {
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild
b/dev-libs/liborcus/liborcus-9999.ebuild
index e87413f..64a4c24 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -20,13 +20,13 @@ LICENSE="MIT"
SLOT="0/0.11" # based on SONAME of liborcus.so
[[ ${PV} == 9999 ]] || \
KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="python static-libs"
+IUSE="python +spreadsheet-model static-libs tools"
RDEPEND="
>=dev-libs/boost-1.51.0:=
- =dev-libs/libixion-9999:=
sys-libs/zlib:=
python? ( ${PYTHON_DEPS} )
+ spreadsheet-model? ( =dev-libs/libixion-9999:= )
"
DEPEND="${RDEPEND}
dev-util/mdds:1
@@ -47,7 +47,9 @@ src_configure() {
econf \
--disable-werror \
$(use_enable python) \
- $(use_enable static-libs static)
+ $(use_enable spreadsheet-model) \
+ $(use_enable static-libs static) \
+ $(use_with tools)
}
src_install() {
diff --git a/dev-libs/liborcus/metadata.xml b/dev-libs/liborcus/metadata.xml
index 13ce236..76fa89e 100644
--- a/dev-libs/liborcus/metadata.xml
+++ b/dev-libs/liborcus/metadata.xml
@@ -5,4 +5,11 @@
<email>[email protected]</email>
<name>Gentoo Office project</name>
</maintainer>
+ <use>
+ <flag name="spreadsheet-model">Enable the spreadsheet model
implementation</flag>
+ <flag name="tools">Build miscellaneous tools</flag>
+ </use>
+ <upstream>
+ <remote-id type="gitlab">orcus/orcus</remote-id>
+ </upstream>
</pkgmetadata>
