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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 13 insertions, 90 deletions

diff --git a/net-p2p/multibit/ChangeLog b/net-p2p/multibit/ChangeLog
index 8a2c4e43d58d..9cd1616d8b0c 100644
--- 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/multibit-0.5.16.ebuild b/net-p2p/multibit/multibit-0.5.16.ebuild
deleted file mode 100644
index e0c47d24b119..000000000000
--- 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
index e0806c4a0059..000000000000
--- 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 792474f9c66c..b77b7efd17ee 100644
--- 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"