| 1 |
commit: 7d66008e865da7d97da7ba991519e51ca57369b8 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 6 09:06:59 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 6 09:06:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d66008e |
| 7 |
|
| 8 |
dev-libs/libiconv: remove userland_GNU |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-libs/libiconv/libiconv-1.15.ebuild | 21 ++++++++------------- |
| 13 |
dev-libs/libiconv/libiconv-1.16.ebuild | 21 ++++++++------------- |
| 14 |
2 files changed, 16 insertions(+), 26 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild |
| 17 |
index d6a93da72c86..6180c813ce14 100644 |
| 18 |
--- a/dev-libs/libiconv/libiconv-1.15.ebuild |
| 19 |
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2021 Gentoo Authors |
| 22 |
+# Copyright 1999-2022 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI="6" |
| 26 |
@@ -15,8 +15,7 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~spar |
| 27 |
IUSE="prefix static-libs" |
| 28 |
|
| 29 |
DEPEND="!sys-libs/glibc |
| 30 |
- !sys-libs/musl |
| 31 |
- !userland_GNU? ( !sys-apps/man-pages )" |
| 32 |
+ !sys-libs/musl" |
| 33 |
RDEPEND="${DEPEND}" |
| 34 |
|
| 35 |
PATCHES=( |
| 36 |
@@ -53,14 +52,10 @@ multilib_src_install_all() { |
| 37 |
# can depend on this |
| 38 |
gen_usr_ldscript -a iconv charset |
| 39 |
|
| 40 |
- # If we have a GNU userland, we probably have sys-apps/man-pages |
| 41 |
- # installed, which means we want to rename our copies #503162. |
| 42 |
- # The use of USELAND=GNU is kind of a hack though ... |
| 43 |
- if use userland_GNU ; then |
| 44 |
- cd "${ED}"/usr/share/man || die |
| 45 |
- local f |
| 46 |
- for f in man*/*.[0-9] ; do |
| 47 |
- mv "${f}" "${f%/*}/${PN}-${f#*/}" || die |
| 48 |
- done |
| 49 |
- fi |
| 50 |
+ # we need to rename our copies #503162 |
| 51 |
+ cd "${ED}"/usr/share/man || die |
| 52 |
+ local f |
| 53 |
+ for f in man*/*.[0-9] ; do |
| 54 |
+ mv "${f}" "${f%/*}/${PN}-${f#*/}" || die |
| 55 |
+ done |
| 56 |
} |
| 57 |
|
| 58 |
diff --git a/dev-libs/libiconv/libiconv-1.16.ebuild b/dev-libs/libiconv/libiconv-1.16.ebuild |
| 59 |
index 6962ed176257..346661c34d79 100644 |
| 60 |
--- a/dev-libs/libiconv/libiconv-1.16.ebuild |
| 61 |
+++ b/dev-libs/libiconv/libiconv-1.16.ebuild |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-# Copyright 1999-2021 Gentoo Authors |
| 64 |
+# Copyright 1999-2022 Gentoo Authors |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
EAPI=7 |
| 68 |
@@ -15,8 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s |
| 69 |
IUSE="prefix static-libs" |
| 70 |
|
| 71 |
DEPEND="!sys-libs/glibc |
| 72 |
- !sys-libs/musl |
| 73 |
- !userland_GNU? ( !sys-apps/man-pages )" |
| 74 |
+ !sys-libs/musl" |
| 75 |
RDEPEND="${DEPEND}" |
| 76 |
|
| 77 |
PATCHES=( |
| 78 |
@@ -44,14 +43,10 @@ multilib_src_configure() { |
| 79 |
multilib_src_install_all() { |
| 80 |
use static-libs || find "${ED}" -name 'lib*.la' -delete |
| 81 |
|
| 82 |
- # If we have a GNU userland, we probably have sys-apps/man-pages |
| 83 |
- # installed, which means we want to rename our copies #503162. |
| 84 |
- # The use of USELAND=GNU is kind of a hack though ... |
| 85 |
- if use userland_GNU ; then |
| 86 |
- cd "${ED}"/usr/share/man || die |
| 87 |
- local f |
| 88 |
- for f in man*/*.[0-9] ; do |
| 89 |
- mv "${f}" "${f%/*}/${PN}-${f#*/}" || die |
| 90 |
- done |
| 91 |
- fi |
| 92 |
+ # we need to rename our copies #503162 |
| 93 |
+ cd "${ED}"/usr/share/man || die |
| 94 |
+ local f |
| 95 |
+ for f in man*/*.[0-9] ; do |
| 96 |
+ mv "${f}" "${f%/*}/${PN}-${f#*/}" || die |
| 97 |
+ done |
| 98 |
} |
Archives