1 |
commit: f28b737d3d3c4afd68df7dfd7a55dc6b2d7c3f3a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 30 19:51:43 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 30 20:07:26 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f28b737d |
7 |
|
8 |
media-libs/libcdr: 0.1.5 version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-libs/libcdr/Manifest | 1 + |
14 |
.../{libcdr-9999.ebuild => libcdr-0.1.5.ebuild} | 27 +++++++++++++--------- |
15 |
media-libs/libcdr/libcdr-9999.ebuild | 27 +++++++++++++--------- |
16 |
3 files changed, 33 insertions(+), 22 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest |
19 |
index 96c205c9a7e..5229407d9c8 100644 |
20 |
--- a/media-libs/libcdr/Manifest |
21 |
+++ b/media-libs/libcdr/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
DIST libcdr-0.1.4.tar.xz 609592 BLAKE2B 201ed19cfe9aa93137279dfa6b9c3908691b2bddd1e8b7fb25505ab475cb8ae533d1b27857c99e36f618938aa7ee88075c3c7f5780872abe68994f380dc893c8 SHA512 769b0319b5a904ce9f727b7076f82cd915ecd8c9e5e2456416e3e6739c6403bbd4108787ab124d36efb1b47d5c9e37c48b0e12d096eb440ae8f9979ec06048a6 |
24 |
+DIST libcdr-0.1.5.tar.xz 612252 BLAKE2B d23c7ae0d0f5cbdb535bfba4dff4ad40e8b0633115cbc8c5b3a40343d941eaeafbffafe99ba2107640eafdd8181ab6eed7917095d05644a43f2b11cfcc66f8f1 SHA512 e985389b0cbad65dbfa9f59d7f9dba55f1684f63e852f9acca9abb863cdaab17072e761b48dca690673360d643686b5e9bc9878530f0a3a8b5b98d917f892cf0 |
25 |
|
26 |
diff --git a/media-libs/libcdr/libcdr-9999.ebuild b/media-libs/libcdr/libcdr-0.1.5.ebuild |
27 |
similarity index 63% |
28 |
copy from media-libs/libcdr/libcdr-9999.ebuild |
29 |
copy to media-libs/libcdr/libcdr-0.1.5.ebuild |
30 |
index 3c04d584f9e..091f92e616d 100644 |
31 |
--- a/media-libs/libcdr/libcdr-9999.ebuild |
32 |
+++ b/media-libs/libcdr/libcdr-0.1.5.ebuild |
33 |
@@ -1,21 +1,23 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
+# Copyright 1999-2018 Gentoo Authors |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
-EAPI=6 |
39 |
+EAPI=7 |
40 |
|
41 |
inherit flag-o-matic |
42 |
|
43 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libcdr.git" |
44 |
-[[ ${PV} == 9999 ]] && inherit autotools git-r3 |
45 |
+if [[ ${PV} = 9999 ]]; then |
46 |
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libcdr.git" |
47 |
+ inherit autotools git-r3 |
48 |
+else |
49 |
+ SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz" |
50 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
51 |
+fi |
52 |
|
53 |
DESCRIPTION="Library parsing the Corel cdr documents" |
54 |
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" |
55 |
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz" |
56 |
|
57 |
LICENSE="MPL-2.0" |
58 |
SLOT="0" |
59 |
-[[ ${PV} == 9999 ]] || \ |
60 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
61 |
IUSE="doc static-libs test" |
62 |
|
63 |
RDEPEND=" |
64 |
@@ -26,6 +28,8 @@ RDEPEND=" |
65 |
" |
66 |
DEPEND="${RDEPEND} |
67 |
dev-libs/boost |
68 |
+" |
69 |
+BDEPEND=" |
70 |
sys-devel/libtool |
71 |
virtual/pkgconfig |
72 |
doc? ( app-doc/doxygen ) |
73 |
@@ -42,11 +46,12 @@ src_configure() { |
74 |
# bug 619448 |
75 |
append-cxxflags -std=c++14 |
76 |
|
77 |
- econf \ |
78 |
- --disable-werror \ |
79 |
- $(use_with doc docs) \ |
80 |
- $(use_enable static-libs static) \ |
81 |
+ local myeconfargs=( |
82 |
+ $(use_with doc docs) |
83 |
+ $(use_enable static-libs static) |
84 |
$(use_enable test tests) |
85 |
+ ) |
86 |
+ econf "${myeconfargs[@]}" |
87 |
} |
88 |
|
89 |
src_install() { |
90 |
|
91 |
diff --git a/media-libs/libcdr/libcdr-9999.ebuild b/media-libs/libcdr/libcdr-9999.ebuild |
92 |
index 3c04d584f9e..091f92e616d 100644 |
93 |
--- a/media-libs/libcdr/libcdr-9999.ebuild |
94 |
+++ b/media-libs/libcdr/libcdr-9999.ebuild |
95 |
@@ -1,21 +1,23 @@ |
96 |
-# Copyright 1999-2018 Gentoo Foundation |
97 |
+# Copyright 1999-2018 Gentoo Authors |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
|
100 |
-EAPI=6 |
101 |
+EAPI=7 |
102 |
|
103 |
inherit flag-o-matic |
104 |
|
105 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libcdr.git" |
106 |
-[[ ${PV} == 9999 ]] && inherit autotools git-r3 |
107 |
+if [[ ${PV} = 9999 ]]; then |
108 |
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libcdr.git" |
109 |
+ inherit autotools git-r3 |
110 |
+else |
111 |
+ SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz" |
112 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
113 |
+fi |
114 |
|
115 |
DESCRIPTION="Library parsing the Corel cdr documents" |
116 |
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" |
117 |
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz" |
118 |
|
119 |
LICENSE="MPL-2.0" |
120 |
SLOT="0" |
121 |
-[[ ${PV} == 9999 ]] || \ |
122 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
123 |
IUSE="doc static-libs test" |
124 |
|
125 |
RDEPEND=" |
126 |
@@ -26,6 +28,8 @@ RDEPEND=" |
127 |
" |
128 |
DEPEND="${RDEPEND} |
129 |
dev-libs/boost |
130 |
+" |
131 |
+BDEPEND=" |
132 |
sys-devel/libtool |
133 |
virtual/pkgconfig |
134 |
doc? ( app-doc/doxygen ) |
135 |
@@ -42,11 +46,12 @@ src_configure() { |
136 |
# bug 619448 |
137 |
append-cxxflags -std=c++14 |
138 |
|
139 |
- econf \ |
140 |
- --disable-werror \ |
141 |
- $(use_with doc docs) \ |
142 |
- $(use_enable static-libs static) \ |
143 |
+ local myeconfargs=( |
144 |
+ $(use_with doc docs) |
145 |
+ $(use_enable static-libs static) |
146 |
$(use_enable test tests) |
147 |
+ ) |
148 |
+ econf "${myeconfargs[@]}" |
149 |
} |
150 |
|
151 |
src_install() { |