From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/libmspub/
Date: Tue, 1 Oct 2019 23:43:41 +0000 (UTC) [thread overview]
Message-ID: <1569973385.367965f5030239eadac2ca3d3f5f97dd483889f6.asturm@gentoo> (raw)
commit: 367965f5030239eadac2ca3d3f5f97dd483889f6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 1 23:32:18 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 1 23:43:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367965f5
app-text/libmspub: EAPI-7 bump, consolidate live build switch
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-text/libmspub/libmspub-9999.ebuild | 38 ++++++++++++++++++----------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
index c627cd0bee6..2035408ee17 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
+if [[ ${PV} = *9999 ]]; then
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
+ inherit autotools git-r3
+else
+ SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
DESCRIPTION="Library parsing Microsoft Publisher documents"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-
IUSE="doc static-libs"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
RDEPEND="
dev-libs/icu:=
dev-libs/librevenge
@@ -29,27 +31,27 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-libs/boost
sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
"
src_prepare() {
default
[[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
+ [[ ${PV} == *9999 ]] && eautoreconf
}
src_configure() {
# bug 619044
append-cxxflags -std=c++14
- econf \
- --disable-werror \
- $(use_with doc docs) \
+ local myeconfargs=(
+ --disable-werror
+ $(use_with doc docs)
$(use_enable static-libs static)
+ )
+ econf "${myeconfargs[@]}"
}
src_install() {
default
- find "${D}" -name '*.la' -delete || die
+ find "${D}" -name '*.la' -type f -delete || die
}
next reply other threads:[~2019-10-01 23:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 23:43 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-21 23:19 [gentoo-commits] repo/gentoo:master commit in: app-text/libmspub/ Sam James
2024-05-22 16:46 Andreas Sturmlechner
2022-03-25 13:55 Jakov Smolić
2022-02-07 0:30 Sam James
2022-02-07 0:30 Sam James
2019-08-01 13:09 Aaron Bauman
2018-08-28 18:42 Sergei Trofimovich
2018-07-15 11:24 Andreas Sturmlechner
2018-07-15 10:25 Sergei Trofimovich
2018-05-29 11:17 Thomas Deutschmann
2018-05-22 16:42 Mikle Kolyada
2018-03-12 5:37 Matt Turner
2018-03-04 22:30 Sergei Trofimovich
2018-03-01 15:44 Andreas Sturmlechner
2018-03-01 15:44 Andreas Sturmlechner
2018-02-19 19:42 David Seifert
2018-01-07 9:55 Andreas Sturmlechner
2017-08-17 17:06 Michał Górny
2017-07-26 8:20 Sergei Trofimovich
2017-01-14 11:25 Jeroen Roovers
2016-12-17 15:57 Andreas Hüttel
2016-09-17 21:32 Andreas Hüttel
2016-07-03 20:27 Andreas Hüttel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1569973385.367965f5030239eadac2ca3d3f5f97dd483889f6.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox