| 1 |
commit: 8fb5f411c1e527073450873366a09a7cfba37172 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 6 15:41:20 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 6 15:41:20 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb5f411 |
| 7 |
|
| 8 |
app-text/aiksaurus: Proper C++17 fix |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/787899 |
| 11 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
app-text/aiksaurus/Manifest | 1 + |
| 15 |
...urus-1.2.1-r1.ebuild => aiksaurus-1.2.1-r2.ebuild} | 19 ++++++++++--------- |
| 16 |
2 files changed, 11 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest |
| 19 |
index e32cf7397c7..2620c5f6235 100644 |
| 20 |
--- a/app-text/aiksaurus/Manifest |
| 21 |
+++ b/app-text/aiksaurus/Manifest |
| 22 |
@@ -1 +1,2 @@ |
| 23 |
+DIST aiksaurus-1.2.1-patches.txz 7196 BLAKE2B c6013301b924a9e6b4fde790bb56848c575f6a8c2a9934a263d3fdfe4a639082c9c1fdaeb0703854d8aba15479c2431738ffb9ef0b750118fd03d0e05a7c6bd3 SHA512 f3db9afbbff5c54d5203db1f09af219c6a6c217018745827b3bc523e156e7d24b197706486f5a88f5829548df88af471d3a7eabdefe7466297dccf786c840520 |
| 24 |
DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463 |
| 25 |
|
| 26 |
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild |
| 27 |
similarity index 67% |
| 28 |
rename from app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild |
| 29 |
rename to app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild |
| 30 |
index 3bc1986d9ba..0062ee0b9a9 100644 |
| 31 |
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild |
| 32 |
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild |
| 33 |
@@ -2,11 +2,14 @@ |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
|
| 36 |
EAPI=7 |
| 37 |
+ |
| 38 |
inherit flag-o-matic libtool |
| 39 |
|
| 40 |
DESCRIPTION="A thesaurus lib, tool and database" |
| 41 |
HOMEPAGE="https://sourceforge.net/projects/aiksaurus" |
| 42 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 43 |
+SRC_URI=" |
| 44 |
+ mirror://sourceforge/${PN}/${P}.tar.gz |
| 45 |
+ https://dev.gentoo.org/~soap/distfiles/${P}-patches.txz" |
| 46 |
|
| 47 |
LICENSE="GPL-2" |
| 48 |
SLOT="0" |
| 49 |
@@ -14,13 +17,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a |
| 50 |
IUSE="gtk" |
| 51 |
|
| 52 |
RDEPEND="gtk? ( x11-libs/gtk+:2 )" |
| 53 |
-DEPEND="${RDEPEND} |
| 54 |
- gtk? ( virtual/pkgconfig ) |
| 55 |
-" |
| 56 |
+DEPEND="${RDEPEND}" |
| 57 |
+BDEPEND="gtk? ( virtual/pkgconfig )" |
| 58 |
|
| 59 |
PATCHES=( |
| 60 |
- "${FILESDIR}/${P}-gcc43.patch" |
| 61 |
- "${FILESDIR}/${P}-format-security.patch" |
| 62 |
+ "${WORKDIR}"/patches/${P}-gcc43.patch |
| 63 |
+ "${WORKDIR}"/patches/${P}-format-security.patch |
| 64 |
+ "${WORKDIR}"/patches/${P}-c++17.patch |
| 65 |
) |
| 66 |
|
| 67 |
src_prepare() { |
| 68 |
@@ -32,12 +35,10 @@ src_prepare() { |
| 69 |
|
| 70 |
src_configure() { |
| 71 |
filter-flags -fno-exceptions |
| 72 |
- # bug 787899 |
| 73 |
- append-cxxflags -std=gnu++14 |
| 74 |
econf $(use_with gtk) |
| 75 |
} |
| 76 |
|
| 77 |
src_install() { |
| 78 |
default |
| 79 |
- find "${D}" -name '*.la' -delete || die |
| 80 |
+ find "${ED}" -name '*.la' -delete || die |
| 81 |
} |
Archives