| 1 |
commit: 36ea03e2c553ebbd7deb00bfd3d35c4548b7c460 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 16 11:40:30 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 16 11:40:30 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ea03e2 |
| 7 |
|
| 8 |
app-i18n/scim-input-pad: Port to EAPI 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/742041 |
| 11 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
.../scim-input-pad/scim-input-pad-0.1.3.1.ebuild | 29 +++++++++++++--------- |
| 15 |
.../scim-input-pad/scim-input-pad-0.1.3.ebuild | 29 +++++++++++++--------- |
| 16 |
2 files changed, 34 insertions(+), 24 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild |
| 19 |
index 4f87c9cc079..d6613ab82f8 100644 |
| 20 |
--- a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild |
| 21 |
+++ b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild |
| 22 |
@@ -1,7 +1,7 @@ |
| 23 |
-# Copyright 1999-2013 Gentoo Foundation |
| 24 |
+# Copyright 1999-2020 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI="4" |
| 28 |
+EAPI=7 |
| 29 |
|
| 30 |
inherit autotools |
| 31 |
|
| 32 |
@@ -14,29 +14,35 @@ SLOT="0" |
| 33 |
KEYWORDS="~amd64 ~x86" |
| 34 |
IUSE="nls" |
| 35 |
|
| 36 |
-RDEPEND=">=app-i18n/scim-1.2.0 |
| 37 |
+RDEPEND=" |
| 38 |
+ >=app-i18n/scim-1.2.0 |
| 39 |
>=x11-libs/gtk+-2.6.0:2" |
| 40 |
- |
| 41 |
-DEPEND="${RDEPEND} |
| 42 |
+DEPEND="${RDEPEND}" |
| 43 |
+BDEPEND=" |
| 44 |
>=dev-util/intltool-0.33 |
| 45 |
virtual/pkgconfig" |
| 46 |
|
| 47 |
src_prepare() { |
| 48 |
- rm "${S}"/m4/intltool.m4 || die |
| 49 |
+ default |
| 50 |
+ |
| 51 |
+ rm m4/intltool.m4 || die |
| 52 |
eautoreconf |
| 53 |
} |
| 54 |
|
| 55 |
src_configure() { |
| 56 |
- econf $(use_enable nls) |
| 57 |
+ econf \ |
| 58 |
+ --disable-static \ |
| 59 |
+ $(use_enable nls) |
| 60 |
} |
| 61 |
|
| 62 |
src_install() { |
| 63 |
- emake DESTDIR="${D}" install |
| 64 |
- dodoc ChangeLog README |
| 65 |
+ default |
| 66 |
+ |
| 67 |
+ # no static archives |
| 68 |
+ find "${ED}" -name '*.la' -delete || die |
| 69 |
} |
| 70 |
|
| 71 |
pkg_postinst() { |
| 72 |
- |
| 73 |
elog |
| 74 |
elog "The SCIM input pad should be startable from the SCIM (and Skim)" |
| 75 |
elog "systray icon right click menu. You will have to restart SCIM" |
| 76 |
@@ -49,7 +55,6 @@ pkg_postinst() { |
| 77 |
elog "table, from the SCIM Input Pad interface." |
| 78 |
elog |
| 79 |
elog "To add new characters to the tables, see the documentation" |
| 80 |
- elog "(README file in /usr/share/doc/${PF})." |
| 81 |
+ elog "(README file in ${EROOT}/usr/share/doc/${PF})." |
| 82 |
elog |
| 83 |
- |
| 84 |
} |
| 85 |
|
| 86 |
diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild |
| 87 |
index 65ab96d29a1..0cbb2a9701e 100644 |
| 88 |
--- a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild |
| 89 |
+++ b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild |
| 90 |
@@ -1,7 +1,7 @@ |
| 91 |
-# Copyright 1999-2012 Gentoo Foundation |
| 92 |
+# Copyright 1999-2020 Gentoo Authors |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
|
| 95 |
-EAPI="4" |
| 96 |
+EAPI=7 |
| 97 |
|
| 98 |
inherit autotools |
| 99 |
|
| 100 |
@@ -14,29 +14,35 @@ SLOT="0" |
| 101 |
KEYWORDS="amd64 x86" |
| 102 |
IUSE="nls" |
| 103 |
|
| 104 |
-RDEPEND=">=app-i18n/scim-1.2.0 |
| 105 |
+RDEPEND=" |
| 106 |
+ >=app-i18n/scim-1.2.0 |
| 107 |
>=x11-libs/gtk+-2.6.0:2" |
| 108 |
- |
| 109 |
-DEPEND="${RDEPEND} |
| 110 |
+DEPEND="${RDEPEND}" |
| 111 |
+BDEPEND=" |
| 112 |
>=dev-util/intltool-0.33 |
| 113 |
virtual/pkgconfig" |
| 114 |
|
| 115 |
src_prepare() { |
| 116 |
- rm "${S}"/m4/intltool.m4 || die |
| 117 |
+ default |
| 118 |
+ |
| 119 |
+ rm m4/intltool.m4 || die |
| 120 |
eautoreconf |
| 121 |
} |
| 122 |
|
| 123 |
src_configure() { |
| 124 |
- econf $(use_enable nls) |
| 125 |
+ econf \ |
| 126 |
+ --disable-static \ |
| 127 |
+ $(use_enable nls) |
| 128 |
} |
| 129 |
|
| 130 |
src_install() { |
| 131 |
- emake DESTDIR="${D}" install |
| 132 |
- dodoc ChangeLog README |
| 133 |
+ default |
| 134 |
+ |
| 135 |
+ # no static archives |
| 136 |
+ find "${ED}" -name '*.la' -delete || die |
| 137 |
} |
| 138 |
|
| 139 |
pkg_postinst() { |
| 140 |
- |
| 141 |
elog |
| 142 |
elog "The SCIM input pad should be startable from the SCIM (and Skim)" |
| 143 |
elog "systray icon right click menu. You will have to restart SCIM" |
| 144 |
@@ -49,7 +55,6 @@ pkg_postinst() { |
| 145 |
elog "table, from the SCIM Input Pad interface." |
| 146 |
elog |
| 147 |
elog "To add new characters to the tables, see the documentation" |
| 148 |
- elog "(README file in /usr/share/doc/${PF})." |
| 149 |
+ elog "(README file in ${EROOT}/usr/share/doc/${PF})." |
| 150 |
elog |
| 151 |
- |
| 152 |
} |
Archives