[gentoo-commits] repo/gentoo:master commit in: media-libs/libpagemaker/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     15f5f7be719eadf9eede79acf00fd86eef341a2d
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Mar 13 23:11:44 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 21:39:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15f5f7be

media-libs/libpagemaker: 0.0.3 version bump

Package-Manager: portage-2.2.27

 media-libs/libpagemaker/libpagemaker-0.0.3.ebuild | 32 ++++++++++++---------
 media-libs/libpagemaker/libpagemaker-9999.ebuild  | 35 ++++++++++++-----------
 media-libs/libpagemaker/metadata.xml              | 14 ++++-----
 3 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/media-libs/libpagemaker/libpagemaker-0.0.3.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.3.ebuild
index 7e2a3af..faf582e 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.3.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.3.ebuild
@@ -2,36 +2,40 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
+EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents."
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
-SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
+
+[[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc tools static-libs"
+IUSE="debug doc tools"
 
 RDEPEND="
 	dev-libs/librevenge
-	"
+"
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.47
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
 src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--disable-werror
-		$(use_enable tools)
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-werror \
+		$(use_enable tools) \
 		$(use_with doc docs)
-		)
-	autotools-utils_src_configure
 }

diff --git a/media-libs/libpagemaker/libpagemaker-9999.ebuild b/media-libs/libpagemaker/libpagemaker-9999.ebuild
index 7dc3320..faf582e 100644
--- a/media-libs/libpagemaker/libpagemaker-9999.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-9999.ebuild
@@ -1,38 +1,41 @@
-# 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
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils git-r3
+EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents."
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
-SRC_URI=""
-EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug doc tools static-libs"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc tools"
 
 RDEPEND="
 	dev-libs/librevenge
-	"
+"
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.47
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
 src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--disable-werror
-		$(use_enable tools)
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-werror \
+		$(use_enable tools) \
 		$(use_with doc docs)
-		)
-	autotools-utils_src_configure
 }

diff --git a/media-libs/libpagemaker/metadata.xml b/media-libs/libpagemaker/metadata.xml
index e82d9da..68183db 100644
--- a/media-libs/libpagemaker/metadata.xml
+++ b/media-libs/libpagemaker/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>office@gentoo.org</email>
-    <name>Gentoo Office project</name>
-  </maintainer>
-  <use>
-    <flag name="tools">Build build tools</flag>
-  </use>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Build build tools</flag>
+	</use>
 </pkgmetadata>