summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2014-04-25 09:19:57 -0600
committerChristoph Junghans <ottxor@gentoo.org>2014-04-25 09:19:57 -0600
commitbb87fa322515de8fd3e73d0cc3782a20e9aa7846 (patch)
treef39fdff5e6afef73b2827d9e2641f23a64e05e5d /app-arch
parentglib-2.38.2: Fix AIX again. (diff)
downloadprefix-bb87fa322515de8fd3e73d0cc3782a20e9aa7846.tar.gz
prefix-bb87fa322515de8fd3e73d0cc3782a20e9aa7846.tar.bz2
prefix-bb87fa322515de8fd3e73d0cc3782a20e9aa7846.zip
implemented suggestions from 507936#c1
(Portage version: 2.2.8-r1/hg/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/unrar/Manifest16
-rw-r--r--app-arch/unrar/unrar-5.1.2.ebuild12
2 files changed, 12 insertions, 16 deletions
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index cff4079b9f..701d0a5232 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -11,17 +11,17 @@ DIST unrarsrc-5.0.13.tar.gz 209449 SHA256 71b378c10264b82b8de6f83a8a4e801a98aefd
DIST unrarsrc-5.1.2.tar.gz 214207 SHA256 98257d7b74a2db18225da2a4bb564cbd591fe10c83bc51430882d3c18965840c SHA512 128f58670d3b04eb8120bd492d5883fd9cbb6b4618505c85790a57ca13346027c868dcd00ea749d204684c6443f59088e352d30ec85089d548fe9282575a801f WHIRLPOOL 1b602078e0a4c0eae89309b00b3b8047662e55469bdf5cf588aecac0148133c14544a7050bc535fd5afdb2a94267e78d29e8d19ef87976bac80ddea882588773
EBUILD unrar-4.2.4.ebuild 1922 SHA256 1ae23fbbb149075f78cb97ee7e8410210169159efcf17266f2951a0dc9849fcf SHA512 ea7a98db2b7325b8cbefdeeea5769d07e58d16bcd4cd717bbc0935ba6b3f9faa80891ab93190c16452db3b4180f750552777bad8642bd0379782d14de2bfbfcd WHIRLPOOL 16c65edfda0932cceafac76a3e25f632f6256b512c6492f6dacf8a7a9623f2d7752ff457f9f51320b84154cfc86fa1e3a051d8939f076c4c0c1f22251ffe3019
EBUILD unrar-5.0.13.ebuild 1898 SHA256 f5bb40157d244b30fa1ca04771f898650ad9350eb31dcae35e46b2719c6652af SHA512 c0e359b25a814253420e9b9590915d339988385261cfc83f40b7edacbe1b204463e8b4f622da21ab616315dfa653a05fc7fecdc3b881dadc3a142304cebd18c1 WHIRLPOOL 4765db892ed57907a574ab93487f1f415c3342e8da376a1fe1443a57f6d284de33cd5be7e111094c2577799f00063cbc3f879bdaff3b9942f4f2a432817922a8
-EBUILD unrar-5.1.2.ebuild 1746 SHA256 e3eabec9a00cf5e407740752e7f6424eaf5e137517c161d34e9ae4661b870abb SHA512 71f804ace6fc832c3b5bf9f8a9bc953a5a09269a7db91f550da9a9f37eca65f2a851ce3d6452e4103a12463104680c58e390a8aa45654dba18e32b3470a08a4f WHIRLPOOL bb2929dcd1f85e645708750770a049c2eb53765a2c677e240486cbe9553fd362c0098fc3a459c2fe0c77c94999ce80aeac7145da40438de2c0c2306ad2f09fcd
+EBUILD unrar-5.1.2.ebuild 1714 SHA256 6114ea42122e5e5d983525b79ff78130d67dcd011a867330252e420e67967223 SHA512 668a6409e19166598d3455010d98f3fb1985e0666561a86fd01b115b7ccc40f7dde0074b81003f92004076966adf72e62d8651fbebc08db594df4d73fa081cc4 WHIRLPOOL f354588a2bd765ddb3f7ab8474ce8f0be470bf24900d85ca9eba08b56d9a5bf981b0c2584e96fd08c7fea8ef406bd606aabd27084acd217b6a3231f20a02dd35
MISC ChangeLog 23993 SHA256 a5ccb0fa6dbf285081f8b64f4ac0058316b366e16f9ed5006c1c41a0ab8a55c3 SHA512 5fb5dad945c469b1f58683b4cba8ecbb16438e984f18693cfc996c0b698999d1fa7f376d902115a3959e061e69a0e29898db832deda68aed732bcaade7faad06 WHIRLPOOL 3521992eb88fdd8dc2f62cca66a7dfa9b5ba88337b61e75e0a3d3f1523804be963e14ca749efd34057e2e8f65b2c982eb528c8ff3cc8ce1544a7ef1acdd57d67
MISC metadata.xml 243 SHA256 0d3b01bee239974acab3b5c25d987a03b929151a254aeefd3cb5bbd0ee6d3c57 SHA512 730e45ced90a8d71ae4613bc3e368baa66cc49c8b74177d23e03461d8785b20fcac940bef5a85044c9bc2f1db2fceee0de441267448174342caa0fe9d08a7034 WHIRLPOOL ab5dd604416cd7afbdee82d410c8eadaaceb8934ccca1a96c5c3f104f8beee50aa19d561a4fc0728c75cbb4683b822dab290c8031920087685fe732b7358bfbb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJTUDSJAAoJEOeBhlrCAAWGkpUH/Amatv1HJ7GR5cITNXEe0mGE
-OSMQEUL2FxtIJKkahcFFmtizmoB/tlea/zzi/PcrM+kRCkGRuFi+LBIOFtzJLtQf
-hpBABRzPcU/EDaJLrJPwKU+d+BR79Ds+IVlHvA2N/ajUgxvojI1tne01kAAtm1eu
-gA0iiFncPbsdvQyvs2SfDQX4ys690qGLwlyyVjutZKPGHFv4+CJAn9yKUvCslaGm
-NKeM+ZYDSSQhOop9mc+MGNlU+SSFDncuuBrkPZ3fTZZsCne0fg8F6BpYzIiSTm2v
-NYmIU4xo9Lh46f5EZ7T18peZpCc3DZxkHAw9JrUYCz9YM+fiM8G5eOgfw2sFd7M=
-=62Qi
+iQEcBAEBCAAGBQJTWn0dAAoJEOeBhlrCAAWGpUwIAKPCpIaxsLPe0LsarweeGFnp
+7qsMaNnIDctqNyisBJ5Q2roQ9c9vrNmtSzxTwKowD23RyscpNczb+a8OPBh1gomE
+wjCM6L1vZ6u/sc0kwhWIwjMpKBFdrizPgNEfXjlz3f9mCAtUlVMRxat7M901EstJ
+JdT7AY4dW3PZJVSW9wYnlbMpE5wlN1CUJaybDmwypXPJc8tSb4OPCwmtagY+0MB0
+TXtqcL+t1sIBme8OwYwcxu//rY2Rw6qcGFayHx/lgemdLzIlVHPM+IJ1g+S5Dbq2
+m8g8yXMtLP1wWv04hV62EZgYfJ6Li4C+CjiVcegzGjZP34dYoAWMwN5G5g/iVNY=
+=RSYz
-----END PGP SIGNATURE-----
diff --git a/app-arch/unrar/unrar-5.1.2.ebuild b/app-arch/unrar/unrar-5.1.2.ebuild
index dbffed5a54..324ccfb0f0 100644
--- a/app-arch/unrar/unrar-5.1.2.ebuild
+++ b/app-arch/unrar/unrar-5.1.2.ebuild
@@ -22,17 +22,13 @@ S=${WORKDIR}/unrar
src_prepare() {
epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
+ local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i \
- -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
- -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/lib/libunrar$(get_libname ${PV%.*.*}):" \
- makefile || die
+ sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
else
- sed -i \
- -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
- -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
- makefile || die
+ sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
fi
+ sed -i "${sed_args[@]}" makefile
}
src_compile() {