| 1 |
commit: a31ab215029444fca12882e0a3571211f0180102 |
| 2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 28 15:47:33 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 28 18:37:42 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a31ab215 |
| 7 |
|
| 8 |
www-client/links: minor fixes. |
| 9 |
|
| 10 |
* Sort USE flags in RDEPEND. |
| 11 |
* Add missing dies in src_install() phase. |
| 12 |
|
| 13 |
Package-Manager: portage-2.3.0 |
| 14 |
|
| 15 |
www-client/links/links-2.14.ebuild | 53 ++++++++++++++++++++++++++------------ |
| 16 |
1 file changed, 36 insertions(+), 17 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-client/links/links-2.14.ebuild b/www-client/links/links-2.14.ebuild |
| 19 |
index 0ad18e4..607bc77 100644 |
| 20 |
--- a/www-client/links/links-2.14.ebuild |
| 21 |
+++ b/www-client/links/links-2.14.ebuild |
| 22 |
@@ -20,21 +20,34 @@ IUSE="bzip2 directfb fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid |
| 23 |
|
| 24 |
GRAPHICS_DEPEND="media-libs/libpng:0=" |
| 25 |
|
| 26 |
-RDEPEND="bzip2? ( app-arch/bzip2 ) |
| 27 |
+RDEPEND=" |
| 28 |
+ bzip2? ( |
| 29 |
+ app-arch/bzip2 |
| 30 |
+ ) |
| 31 |
directfb? ( |
| 32 |
${GRAPHICS_DEPEND} |
| 33 |
dev-libs/DirectFB |
| 34 |
- ) |
| 35 |
- fbcon? ( ${GRAPHICS_DEPEND} ) |
| 36 |
- gpm? ( sys-libs/gpm ) |
| 37 |
- jpeg? ( virtual/jpeg:0 ) |
| 38 |
- libevent? ( dev-libs/libevent:0= ) |
| 39 |
+ ) |
| 40 |
+ fbcon? ( |
| 41 |
+ ${GRAPHICS_DEPEND} |
| 42 |
+ ) |
| 43 |
+ gpm? ( |
| 44 |
+ sys-libs/gpm |
| 45 |
+ ) |
| 46 |
+ jpeg? ( |
| 47 |
+ virtual/jpeg:0 |
| 48 |
+ ) |
| 49 |
+ libevent? ( |
| 50 |
+ dev-libs/libevent:0= |
| 51 |
+ ) |
| 52 |
livecd? ( |
| 53 |
${GRAPHICS_DEPEND} |
| 54 |
sys-libs/gpm |
| 55 |
virtual/jpeg:0 |
| 56 |
- ) |
| 57 |
- lzma? ( app-arch/xz-utils ) |
| 58 |
+ ) |
| 59 |
+ lzma? ( |
| 60 |
+ app-arch/xz-utils |
| 61 |
+ ) |
| 62 |
ssl? ( |
| 63 |
!libressl? ( dev-libs/openssl:0= ) |
| 64 |
libressl? ( dev-libs/libressl:0= ) |
| 65 |
@@ -42,13 +55,17 @@ RDEPEND="bzip2? ( app-arch/bzip2 ) |
| 66 |
svga? ( |
| 67 |
${GRAPHICS_DEPEND} |
| 68 |
media-libs/svgalib |
| 69 |
- ) |
| 70 |
- tiff? ( media-libs/tiff:0 ) |
| 71 |
+ ) |
| 72 |
+ tiff? ( |
| 73 |
+ media-libs/tiff:0 |
| 74 |
+ ) |
| 75 |
X? ( |
| 76 |
${GRAPHICS_DEPEND} |
| 77 |
x11-libs/libXext |
| 78 |
- ) |
| 79 |
- zlib? ( sys-libs/zlib )" |
| 80 |
+ ) |
| 81 |
+ zlib? ( |
| 82 |
+ sys-libs/zlib |
| 83 |
+ )" |
| 84 |
|
| 85 |
DEPEND="${RDEPEND} |
| 86 |
virtual/pkgconfig |
| 87 |
@@ -64,10 +81,10 @@ src_prepare() { |
| 88 |
default |
| 89 |
|
| 90 |
if use unicode; then |
| 91 |
- pushd intl >/dev/null |
| 92 |
+ pushd intl > /dev/null || die |
| 93 |
./gen-intl || die |
| 94 |
./synclang || die |
| 95 |
- popd >/dev/null |
| 96 |
+ popd > /dev/null || die |
| 97 |
fi |
| 98 |
|
| 99 |
# error: conditional "am__fastdepCXX" was never defined (for eautoreconf) |
| 100 |
@@ -120,9 +137,11 @@ src_install() { |
| 101 |
newicon Links_logo.png links.png |
| 102 |
make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser' |
| 103 |
local d="${ED}"/usr/share/applications |
| 104 |
- echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop |
| 105 |
- use ssl && sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \ |
| 106 |
- "${d}"/*.desktop |
| 107 |
+ echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die |
| 108 |
+ if use ssl; then |
| 109 |
+ sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \ |
| 110 |
+ "${d}"/*.desktop || die |
| 111 |
+ fi |
| 112 |
fi |
| 113 |
|
| 114 |
use suid && fperms 4755 /usr/bin/links |
Archives