use dobin instead of exeinto /usr/bin/ && doexe; drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/net-p2p/multibit/ChangeLog b/net-p2p/multibit/ChangeLog
index 8a2c4e43d58d13466e7260202beafd84a9f00af7..9cd1616d8b0c2070c35f1af39193869078728059 100644 (file)
--- a/net-p2p/multibit/ChangeLog
+++ b/net-p2p/multibit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/multibit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/multibit/ChangeLog,v 1.4 2014/05/26 21:24:06 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/multibit/ChangeLog,v 1.5 2015/03/21 19:54:30 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -multibit-0.5.16.ebuild,
+  -multibit-0.5.17.ebuild, multibit-0.5.18.ebuild:
+  use dobin instead of exeinto /usr/bin/ && doexe; drop old
 
 *multibit-0.5.18 (26 May 2014)
 

diff --git a/net-p2p/multibit/Manifest b/net-p2p/multibit/Manifest
index e62f485b48cbcbccc9716645aa22e8bbf972e570..640ea04b1bcf1f023131fab7edf0f04c2516dea4 100644 (file)
--- a/net-p2p/multibit/Manifest
+++ b/net-p2p/multibit/Manifest
@@ -1,30 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX auto-install.xml 862 SHA256 bbff8cbc64138bda862d34df6ef857024ccfa658ea22123b57468a558876e2e1 SHA512 54b1744d6efb74c9afad771fbab7f293ab102e7f5948ae9c47af60e5bb385419efcdce074795fb633a33d3f358d3814aa368ae7f600c55bcab791d30d6c0895f WHIRLPOOL 6efd75de5537753459d3e77054364a8b3af442b2f9306d720b1104be77b0a34be1c0aa077cf8887a2a5de189282a7fa447dd1fc7ae3b95dfce22c3fd993217d0
 AUX multibit 81 SHA256 40e5aba42864e56922c702a7c1a2d303e19d409f6c1995e5c7319ba86e3b04a1 SHA512 05a87d14a45478a677691b1318777f484892afe88f67ee0e0768273c78ef95b7ba10171db79fa27688944e253ddf572f8b2d7dc61f807a57366cbdb0cbf1b84c WHIRLPOOL b282252d81b42c5af18c24be829953fdb0bb799ff3efa8fa6e20e68de4e9de5c67abaf2a9206b3db723d15d10d6fe5e083a3231f9b177e42151d5f39773d2c7d
-DIST multibit-0.5.16-linux.jar 8318874 SHA256 9ddd139167500036520e322ed6a4feecaf962446e2eb520cf9b28ea05548fbf6 SHA512 54603ab4670f94678bcc7755b3af678c0a3ca107eb605f75502d01fd5f880bf2a3a594da5b5b9884b1f2aca4cca73ed623bee26276ee22fe36c55d6cc8ea0870 WHIRLPOOL 7474a38d7471a24ea8db540e0221959624a353ccad714ab7ace07fe714b129dd94ae258374af0f02e5df5e4e8b83e4297151b2ad9e353d540b617cf677d0304f
-DIST multibit-0.5.17-linux.jar 8472625 SHA256 e6ec9b243aa57c822ebe016b7ca82d5206a1151ddb1b7c8e8119f73deb15ea42 SHA512 5ac2335338ca956653555cb979f09b74562bc449a6ee425b93a9e840956ddd144b2437cb8755eda873e5b7cb740d8de8db8089296f5c9cba22c67ab7aab40c17 WHIRLPOOL 9c38f239c02d1971fd6a93ac9420b327aa5f32e564987ce9f0d865737579c5a5e1eb8fe2c3387ac3af9479cc30007f7e51f9bdbd7623d033b10cd892fea1cfac
 DIST multibit-0.5.18-linux.jar 7993916 SHA256 a067c9638edfdf39f3e9fa154b0c6d8cfb7c58c0edd95a02c0ca903160ca3aad SHA512 788910b4a8b27f345df2cc58f8641a34d038091ffcddd69eca07c9452ed406113cf70479e6214ea52f39536d8eb21b34ecb7ab359868199223b2796b50b1b561 WHIRLPOOL d75467437d0d6eb744fce183071c1197386481ffc905d6abb02a31a6725b1e2b61c388815e0839b2120bd37029e9bf8ae76aa4ed5980ff30fb2abc041ec80549
-EBUILD multibit-0.5.16.ebuild 971 SHA256 53a0bb0a8a7a30ebaa519cd8984a4fa246f2d155fd5d0e813eece646803a624d SHA512 6ea99b975caac02d77466635b5b3c15e6773b8b93b0e2a47a3a9c3d73077967b5c1449df9a402d5cb631062772089a876e02bbaac014a6eb8bd62f9f8520c359 WHIRLPOOL e68aaf0fd8598096be6df492191db632ca425997dc29973eaca8873ad978cae5b769a2b50aade5f8d6ae5da57ee44ac41b5cdd7c0974ca0f307aaadbf19cce88
-EBUILD multibit-0.5.17.ebuild 971 SHA256 c3294a9a15fa9080067c8a72f2b892b152f4b6beead6c0a592ba2d77da884870 SHA512 d34eee15082bc5c68aedb45549007b3a8093df6b4461cd77d9a472a22ad3729a60c2a646ade1a061633db30d6a721e8b85fcc083b4b9e24435ef3a762a246b75 WHIRLPOOL b17c5e22967adc0f292cd2f62e64544e47f14a6977e22d932d77482af8748455eb01cb4803aa0090906ff521cd063d3910c36642841c4ad456b1da43b9a4e95e
-EBUILD multibit-0.5.18.ebuild 971 SHA256 61dd1e1b5d2ac6856fa862599cbfdb60fb8057eadb34540315002e2233f56022 SHA512 6eccd98286d15584addff0ffb70c193883955d3bff0a372bbff28a530991fae6e017aa8091267826c5848681ea88680c13f5ecfa5f3e195199e19793d6a0ded6 WHIRLPOOL e6a0840f4ec9bca789625721c78cf9f8e7d58f5d8d28e7d51f0b747e3672267f78405237c408372050ac8998f18710c379cd7beec3da3dbefd5fd96e9ca3641f
-MISC ChangeLog 873 SHA256 80f95beb037704f29d07fc8f582acef06fe156ff0b4d8dec7260d9a669faf015 SHA512 ca83141100b77ab7f175f86d941334f6d227b8f429605b7b4a43efd6b770080a22792604e33bd341487ada74e88c1ff57e6a54784d61d944c4f077d8c0163126 WHIRLPOOL 6ecbd82f13ff450866b4bf8461b2e37c00dc69281bbb463a72a641a9be3505f52f550d6fa0c100afb9e8218288dc1c5d370e933f7010afe038b1d9f83a3ce6c1
+EBUILD multibit-0.5.18.ebuild 950 SHA256 42f376075ae45c9b0119a9df94e15e1425fae2003d556c7b9d106147bc65ded2 SHA512 8a521c47b31ed81ea96c4490684e66d552e30001b513a7075c359993c06978f5d3b7e4e90b3a724f0db46cb925954f10fbf020f6700979c1ede6f308c78f85af WHIRLPOOL 4a563b727246c7f5ad7ae7ebd3c4b52e81dca6fbf8af6f1824ade83d699d46c1cd4ba03a6be034d8b2cb8d435d02609810caa0e91ee804209b20d80c35e7c63b
+MISC ChangeLog 1053 SHA256 9e968772d1109cb76afdaafef435a297048c824ac766a77752521c962f942108 SHA512 f9b613a83ceeef622bf6a387a03610e6232f1ce8b8978e250ed98dfc2830436848783fee5f57ff5dc1329842a1a60cc9a1457ea55df87d313045e9fe48f1f197 WHIRLPOOL af6fe4a631878e95621f7b5e603a21cffd55a87d1684b31e8113be533ae41f50973a8b6b437c1a3761ca24e516a467be419c9fcd75c174610ff4c7f4eaf6b07d
 MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTg7GQAAoJEJOE+m71LUu6Ot8P/3GD99KC1RUYjT0ZitSGnnVx
-7cMQJ74QXY03ZKf+48QM541fpJhXb2Kw6Bre8+XSz5pFqku6Uc4l/6SlbOMJREhe
-RhTekz+mJSvSIaP6nve+YmnC9j0iCf6RiDwF7QGtjuK+p3Lm95RJY93f72mW7Rw9
-2/WwCO6d0OHlSeFfS76qmSlT9pOAw2NZfnsYlj0KXjSfiioYndgWWgI1XtOXY2fz
-jodUYiJwrItg4qvJwDhqlMlMbaBYLtTk06RAlf5xZBfcvzfM08lciJKwsCTVq7w7
-dE52zshOVZVXxP5ezHZzXcoLZeWGcRyS85+kpB8F3jZJoT8wnhM8URrek7r7u7p1
-NfCDtDJ1ReF8Q1r/l27FMFgfKWjr0th1DP6pI1TtdIxfmSnPYdC9gyF1VYcliGQ3
-rxsU1KU0477lEQIJKYLTokB6yUNRYIoDpi7ph5pNrN/PyYWyfPFsKe9FpGlywOqN
-tM5wp32wj3zh/ZvlFmvCGM6s14fxsJxTkoxSYc4iX90SKZLClEDX7PVh8h8HT9/h
-wqzOBR2xwOqHEu8c99GscWn1ZDp+Oh9p9gtl/A57Q+pdJQ93Pe4ncec/JTIRL2tP
-dCUVQPxbVX3fcDicTzRH0SvKFZsGf9brseIR17TOeClqls7SPd2I2PgzqqE461nx
-CNqRUSWugFPZafl+4IDb
-=SjUV
+iQJ8BAEBCgBmBQJVDcx6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirdIEP/j/AZwLhk1vgW+SUwIgO8YKB
+kR5XZ+uiAG29AT6JYUx0GJcbuqjlZBgF1LiHOMwXg9Wv1Sia2lm/FF3cP9CPpL7k
+BZDJ3lKQVTDP2BCNi9XHBvtOH4B7J9h8fV3wyUhxg/Kc6x0AErrUqno7VL+0KmTn
+9S7dX6HXEQrupRGdmvc2mkW3b5ymv+JrMGRr3Cqae8JEP6DgytDnwp1iKH4hVJ7u
+xz1w/wWKa76OKNTHfpy412HxT1VCksFDTcVvWKE0RnVOOefAOu/pti2hIXBAz/4N
+e62XZPhOmtvPVB0n8GQfrHpj1eLhWY22epXp+i2rTyhiCQppE2wVKXqpPCBEA2cl
+CIRA+1S75CUIEPM1sdA0cPriPzHM36LYh3evyfNeg9vp9f/VkvHreZKOjBGMHNE2
+dTLykC/rDnZ44H1ud+bF2IRwsSGt/65pNzsGCxR9JsOW/IWgxHoqKMpF/6TDs0OS
+YFB03SkNwZAreY8LBDDeQHTGV2yFZUigbCqxatAqgi+9rKC/93uKYyFndi5XmeFB
+CLH4dTBglsVe1fy/j40Gr2OLC1MXVSNGB/KfK6b5Wa4d2eVQpEID2kr2r74ilQDk
+x/v5qbCLcSsSqcSbvXo8nROMbRTdv31EpA62LSLmXccqpr8++Pphivf6u5bEAcZ/
+QBD9xcHv8XfndgvbYqMS
+=I8Br
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/multibit/multibit-0.5.16.ebuild b/net-p2p/multibit/multibit-0.5.16.ebuild
deleted file mode 100644 (file)
index e0c47d2..0000000
--- a/net-p2p/multibit/multibit-0.5.16.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/multibit/multibit-0.5.16.ebuild,v 1.1 2013/12/28 18:41:36 blueness Exp $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="MultiBit is a secure, lightweight, international Bitcoin wallet written in Java"
-HOMEPAGE="https://multibit.org/"
-SRC_URI="https://multibit.org/releases/${P}/${P}-linux.jar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=virtual/jre-1.6"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-:
-}
-
-src_prepare() {
-       cp "${FILESDIR}"/auto-install.xml "${WORKDIR}"
-       sed -i "s:ED:${ED}:" auto-install.xml
-}
-
-src_install() {
-       exeinto /usr/bin
-       doexe "${FILESDIR}"/${PN}
-
-       make_desktop_entry "${PN}" "Multibit" "/opt/MultiBit/multibit48.png" "GNOME;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/multibit;\nTerminal=false"
-
-       java -jar "${DISTDIR}"/${P}-linux.jar auto-install.xml >/dev/null 2>&1
-}

diff --git a/net-p2p/multibit/multibit-0.5.17.ebuild b/net-p2p/multibit/multibit-0.5.17.ebuild
deleted file mode 100644 (file)
index e0806c4..0000000
--- a/net-p2p/multibit/multibit-0.5.17.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/multibit/multibit-0.5.17.ebuild,v 1.1 2014/04/14 11:13:27 blueness Exp $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="MultiBit is a secure, lightweight, international Bitcoin wallet written in Java"
-HOMEPAGE="https://multibit.org/"
-SRC_URI="https://multibit.org/releases/${P}/${P}-linux.jar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=virtual/jre-1.6"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-:
-}
-
-src_prepare() {
-       cp "${FILESDIR}"/auto-install.xml "${WORKDIR}"
-       sed -i "s:ED:${ED}:" auto-install.xml
-}
-
-src_install() {
-       exeinto /usr/bin
-       doexe "${FILESDIR}"/${PN}
-
-       make_desktop_entry "${PN}" "Multibit" "/opt/MultiBit/multibit48.png" "GNOME;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/multibit;\nTerminal=false"
-
-       java -jar "${DISTDIR}"/${P}-linux.jar auto-install.xml >/dev/null 2>&1
-}

diff --git a/net-p2p/multibit/multibit-0.5.18.ebuild b/net-p2p/multibit/multibit-0.5.18.ebuild
index 792474f9c66caaa8ed7517e98bcc01d8e94cec1e..b77b7efd17ee7eb833f61c95752de1c62786ce69 100644 (file)
--- a/net-p2p/multibit/multibit-0.5.18.ebuild
+++ b/net-p2p/multibit/multibit-0.5.18.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/multibit/multibit-0.5.18.ebuild,v 1.1 2014/05/26 21:24:06 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/multibit/multibit-0.5.18.ebuild,v 1.2 2015/03/21 19:54:30 jlec Exp $
 
 EAPI=5
 
 inherit eutils
 
-DESCRIPTION="MultiBit is a secure, lightweight, international Bitcoin wallet written in Java"
+DESCRIPTION="Secure, lightweight, international Bitcoin wallet written in Java"
 HOMEPAGE="https://multibit.org/"
 SRC_URI="https://multibit.org/releases/${P}/${P}-linux.jar"
 
@@ -20,18 +20,15 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}
 
-src_unpack() {
-:
-}
+src_unpack() { :; }
 
 src_prepare() {
-       cp "${FILESDIR}"/auto-install.xml "${WORKDIR}"
-       sed -i "s:ED:${ED}:" auto-install.xml
+       cp "${FILESDIR}"/auto-install.xml "${WORKDIR}" || die
+       sed -i "s:ED:${ED}:" auto-install.xml || die
 }
 
 src_install() {
-       exeinto /usr/bin
-       doexe "${FILESDIR}"/${PN}
+       dobin "${FILESDIR}"/${PN}
 
        make_desktop_entry "${PN}" "Multibit" "/opt/MultiBit/multibit48.png" "GNOME;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/multibit;\nTerminal=false"