1 |
commit: 6326de87e9f6e14fe2cd72839e21a4cb45534b18 |
2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
3 |
AuthorDate: Thu Mar 22 11:54:34 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 26 20:19:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6326de87 |
7 |
|
8 |
app-accessibility/brltty: bump to EAPI 6 |
9 |
|
10 |
Also readjusted the epatch call to an eapply call, added |
11 |
HTML_DOCS/einstalldocs as dohtml is deprecated on EAPI=6, |
12 |
and adjusted the keepdir call to point at the correct directory. |
13 |
|
14 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
15 |
Closes: https://github.com/gentoo/gentoo/pull/7590 |
16 |
|
17 |
app-accessibility/brltty/brltty-5.2-r1.ebuild | 43 ++++++++++++---------- |
18 |
.../brltty/files/brltty-5.2-respect-AR.patch | 5 +-- |
19 |
.../brltty/files/brltty-5.2-udev.patch | 5 +-- |
20 |
3 files changed, 28 insertions(+), 25 deletions(-) |
21 |
|
22 |
diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild |
23 |
index 8b9f34c0e4f..3622819ef62 100644 |
24 |
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild |
25 |
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild |
26 |
@@ -1,7 +1,7 @@ |
27 |
-# Copyright 1999-2017 Gentoo Foundation |
28 |
+# Copyright 1999-2018 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
|
31 |
-EAPI=5 |
32 |
+EAPI=6 |
33 |
|
34 |
PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
35 |
FINDLIB_USE="ocaml" |
36 |
@@ -42,11 +42,17 @@ DEPEND="virtual/pkgconfig |
37 |
RDEPEND="java? ( >=virtual/jre-1.4 ) |
38 |
${COMMON_DEP}" |
39 |
|
40 |
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. ) |
41 |
+ |
42 |
+PATCHES=( |
43 |
+ "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch |
44 |
+ "${FILESDIR}"/${PN}-5.2-udev.patch |
45 |
+ "${FILESDIR}"/${PN}-5.2-respect-AR.patch |
46 |
+ "${FILESDIR}"/${PN}-5.2-sysmacros.patch |
47 |
+) |
48 |
+ |
49 |
src_prepare() { |
50 |
- epatch "${FILESDIR}"/${P}-fix-ldflags.patch \ |
51 |
- "${FILESDIR}"/${P}-udev.patch \ |
52 |
- "${FILESDIR}"/${P}-respect-AR.patch \ |
53 |
- "${FILESDIR}"/${P}-sysmacros.patch |
54 |
+ default |
55 |
|
56 |
java-pkg-opt-2_src_prepare |
57 |
|
58 |
@@ -163,30 +169,29 @@ src_install() { |
59 |
|
60 |
libdir="$(get_libdir)" |
61 |
mkdir -p "${D}"/usr/${libdir}/ |
62 |
- mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ |
63 |
+ mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die |
64 |
gen_usr_ldscript libbrlapi.so |
65 |
|
66 |
- cd Documents |
67 |
- mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt |
68 |
- mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt |
69 |
- mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt |
70 |
+ cd Documents || die |
71 |
+ mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die |
72 |
+ mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die |
73 |
+ mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die |
74 |
dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt |
75 |
- dohtml -r Manual-BRLTTY |
76 |
if use doc; then |
77 |
- dohtml -r Manual-BrlAPI |
78 |
dodoc BrlAPI-*.txt |
79 |
+ HTML_DOCS="Manual-BRLTTY" einstalldocs |
80 |
fi |
81 |
|
82 |
- keepdir /var/lib/brlapi |
83 |
- rmdir "${D}/run/brltty" |
84 |
- rmdir "${D}/run" |
85 |
+ keepdir /var/lib/BrlAPI |
86 |
+ rmdir "${D}/run/brltty" || die |
87 |
+ rmdir "${D}/run" || die |
88 |
} |
89 |
|
90 |
pkg_postinst() { |
91 |
elog |
92 |
- elog please be sure "${ROOT}"etc/brltty.conf is correct for your system. |
93 |
+ elog "please be sure ${ROOT}etc/brltty.conf is correct for your system." |
94 |
elog |
95 |
- elog To make brltty start on boot, type this command as root: |
96 |
+ elog "To make brltty start on boot, type this command as root:" |
97 |
elog |
98 |
- elog rc-update add brltty boot |
99 |
+ elog "rc-update add brltty boot" |
100 |
} |
101 |
|
102 |
diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch |
103 |
index 95451dc98b7..c5698a2b939 100644 |
104 |
--- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch |
105 |
+++ b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch |
106 |
@@ -1,6 +1,5 @@ |
107 |
-diff -Naur brltty-5.2/Programs/Makefile.in brltty-5.2-new/Programs/Makefile.in |
108 |
---- brltty-5.2/Programs/Makefile.in 2014-11-06 07:28:41.000000000 -0800 |
109 |
-+++ brltty-5.2-new/Programs/Makefile.in 2014-11-20 05:41:57.144219093 -0800 |
110 |
+--- a/Programs/Makefile.in |
111 |
++++ b/Programs/Makefile.in |
112 |
@@ -434,7 +434,7 @@ |
113 |
[ ! -f lib.def ] || mv lib.def $(API_DEF) |
114 |
|
115 |
|
116 |
diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch b/app-accessibility/brltty/files/brltty-5.2-udev.patch |
117 |
index dbbc2989766..e6d56603b01 100644 |
118 |
--- a/app-accessibility/brltty/files/brltty-5.2-udev.patch |
119 |
+++ b/app-accessibility/brltty/files/brltty-5.2-udev.patch |
120 |
@@ -1,6 +1,5 @@ |
121 |
-diff -Naur brltty-5.2/Autostart/Udev/udev.rules brltty-5.2-new/Autostart/Udev/udev.rules |
122 |
---- brltty-5.2/Autostart/Udev/udev.rules 2014-11-06 07:28:41.000000000 -0800 |
123 |
-+++ brltty-5.2-new/Autostart/Udev/udev.rules 2014-11-20 05:28:44.404885312 -0800 |
124 |
+--- a/Autostart/Udev/udev.rules |
125 |
++++ b/Autostart/Udev/udev.rules |
126 |
@@ -182,20 +182,22 @@ |
127 |
# FreedomScientific [Focus Blue] |
128 |
ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" |