use dobin instead of exeinto /usr/bin/ && doexe

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

5 files changed, 66 insertions, 116 deletions

diff --git a/sci-mathematics/reduce/ChangeLog b/sci-mathematics/reduce/ChangeLog
index 47ee8074a82f..524f134b4683 100644
--- a/sci-mathematics/reduce/ChangeLog
+++ b/sci-mathematics/reduce/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/reduce
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/reduce/ChangeLog,v 1.4 2011/12/22 12:23:03 grozin Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/reduce/ChangeLog,v 1.5 2015/03/21 20:51:37 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -reduce-20110414.ebuild,
+  metadata.xml, reduce-20110414-r1.ebuild:
+  use dobin instead of exeinto /usr/bin/ && doexe
 
 *reduce-20110414-r1 (22 Dec 2011)
 
@@ -25,4 +29,3 @@
   05 Jan 2011; Andrey Grozin <grozin@gentoo.org> +files/64reduce-gentoo.el,
   +reduce-20101007.ebuild, +files/reduce, +metadata.xml:
   Initial import
-
diff --git a/sci-mathematics/reduce/Manifest b/sci-mathematics/reduce/Manifest
index b9c9ca76f2fe..c43cb1d081c4 100644
--- a/sci-mathematics/reduce/Manifest
+++ b/sci-mathematics/reduce/Manifest
@@ -1,8 +1,29 @@
-AUX 64reduce-gentoo.el 215 RMD160 c1ea0ffbb343c45610dc9343b19cf99d49a64ebb SHA1 c14ddfffaf88f454acee2dad81be9d6b6060a1d6 SHA256 f5a36df7b436104b4ed133edd02a261163f39ee265d2fb19214ab940c159dd23
-AUX csl 38 RMD160 8b9bee18834a82c3e0681455c35174385a0d3796 SHA1 5001f02d0d74c8c1c9df83eca8299ec63fd328e6 SHA256 d99f85be4783179534d8c805f839d66b75671caa21516a6ba7497fd9639bd68b
-AUX redcsl 41 RMD160 f8f86cdf3625e70a07a406f6e04849fa6b9acdcb SHA1 5ab636dacd8eb732870f2a093b9e87d0a187afc0 SHA256 bd76b9bc8eb3ea6445793db744c5d2833e4f777242996e597f9015ad983ee8ba
-DIST reduce-src-20110414.tar.bz2 136783974 RMD160 cd9842fe607b439a8db8daf8083eb2aaa9ac05d7 SHA1 a6c73f5fcaa3efeb1cb9650bb6478d912e3914a1 SHA256 d6ac7a30e817ea71555d21b03a119a5236967b251eae8946a1817ae9a81cee03
-EBUILD reduce-20110414-r1.ebuild 2551 RMD160 d769f90c1c015dad5fdbf2ef876388822e8f313f SHA1 4236fda9efb5ca8f92b4dfe3f0b28027f5aee4ce SHA256 a113fe891e597887c9db7a7c0f936e93911f9c7c2320554b9fb37299cc8357d4
-EBUILD reduce-20110414.ebuild 2151 RMD160 22e332cc3714897e453d83e33dea430372eabb33 SHA1 7e7e930202ad60275126eaf7bfc6a93cc64091bf SHA256 1a80ecb2e36af574c424914fe146f911d50a94232efae307cf457c1b5fadcdce
-MISC ChangeLog 993 RMD160 08cbed1c92ecff7d7790899f3bd6d6ed11c5d4ff SHA1 c6196694a0a47c7e0466b3c5b634f6ab3416131e SHA256 e61664d337f23ae7861edbe13f708f3d2e6930789008127e0b5cd1086cd1c0f5
-MISC metadata.xml 381 RMD160 e4e15644314b8ebedf988136c974a4eb06944d55 SHA1 43012cd92b799a81f00cfb715de849f61a9169f0 SHA256 0ab958d614f9d0a5ff87b86bf74ab0ef616bc355757e34f69f1d2f53efbc7d6d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX 64reduce-gentoo.el 215 SHA256 f5a36df7b436104b4ed133edd02a261163f39ee265d2fb19214ab940c159dd23 SHA512 f2549e91ae3b48c4e90c7f2d4d05779d8d2df67ccffda64387f08e2a8aefbf4ffba336ca0a8b2d00ec6d5533ad9049452f4862e22177344479eec6ca709a8398 WHIRLPOOL 68673bb77e10ad9a5e1206804fd821473d27827a620ddffc018d2127fb413f7e4167e9c5eefbf4bc6d600913bba52ccab40b6f75ee0f7988978293cf893dc5e3
+AUX csl 38 SHA256 d99f85be4783179534d8c805f839d66b75671caa21516a6ba7497fd9639bd68b SHA512 3e492f318f8754d365d8aa711419e091760db547769cd6567ce4da1190379ed97b14e741ea7907646728002520229f683fda1b560c8de4777a9fcef0759bd738 WHIRLPOOL a54963acd7b1e650a6bb693472bd527d9bf7a3cd9f1d9e48bfcb1ca8bdcdab6af16fe24d63157119b6f51182092bf129e7979b5a31bb769ce69dc4d2ea7bba07
+AUX redcsl 41 SHA256 bd76b9bc8eb3ea6445793db744c5d2833e4f777242996e597f9015ad983ee8ba SHA512 c8281a9e30017fd4695bc6f41d30d92a73588ca253e5b6966327671c9cc358c4850349f5913e9a3c98166e089cf8d1756bbedc9bf10e73c3757eeaef09a3eafa WHIRLPOOL 828347ae61e1e14e5ecaec2ead64938635d5e4ffb1a79396c736b38f7081d8611aa0aa5f658dbff4b844ff89a09a9e22a2938c10c76d1e23778f967d341b46bd
+DIST reduce-src-20110414.tar.bz2 136783974 SHA256 d6ac7a30e817ea71555d21b03a119a5236967b251eae8946a1817ae9a81cee03
+EBUILD reduce-20110414-r1.ebuild 2532 SHA256 8cc6602a8b66b13c88e8c76cf61c233b7cb4934e37da17c6507aeb2fa6f8f717 SHA512 a575945da4c3f665c237b94c16a0a215e790004a239bb7a3f0fc29dbb38799a4bbf5b637fb5887a40d59fa7d988f9c3a044d146b0a43f9319f4ad5954c865f97 WHIRLPOOL d36c160b8ced1741c5e1e4874503fc8b969f9f6e639627c291862edfca252918084309613c8d9d0a3928d88f92e7a6166c97ee626a7489ccc010fc01f45da361
+MISC ChangeLog 1156 SHA256 457ae17696ffdd0d57fed5c8138c0a183dcc143d922bc6e679a799b9fc1b2a3e SHA512 51b782cad49c8e22c2c3b4586d56e0000fff5f229baaeb81dd0f97d61b88429eb141de489986b7a16fd4c818f08456018603e236affe3a4426fe225cf0ace3e3 WHIRLPOOL a6eea8cba8056f8bfcc77dc60adcd0a73d31df1bb4ff74a1e6db209a958379774dfbc4f37e06c6d9ce3b25ab2ea710aa173076630ad5869b5210684a0342c004
+MISC metadata.xml 393 SHA256 db3a2046963756f1398bcf18d72180e9139c0adfa1291299b492bc9800ae7e08 SHA512 fc461a71a89b6bd2a9d78eb80cba2c24740d82999ea308016f9da47efeb1e9e5b3f938689a11cd2ba80c908498842c731a12eb7c83d53d70b3d6a590dbb3c6f9 WHIRLPOOL cac87d68acc37f292acd860555ed4ade1814e61bb3ace6b4f51d206de406aee1c1638960c56ac7308cc6ef22d5c99371bc3c6d36e9319a3001d84d5cb6b670e7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVDdnaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirClsP/0A857rTjBGIXrBTy41hZH+z
+D27mB01I1skwG+SpuSVUyCQo9T2xme9NHJNnCTKs3O9eWXUNsJ8t2X6dakSdLxY+
+Gj7NWqmCtJWZqRAzct9/WMU1SbSt/AhhoSd8AUtLenXpQlqRbSl9RgIh/BvKXTk8
+SCg04wKYDuH3wuTv+QGHZ+73/RwfUD+zqpY4MbbK3SrN81cfJ292GSu7xYcSK2HI
+QKv/P8aVkT/YEAFzF4J3PUAZZ4Pr+2SVKvh8R9ri1ZiZE/vzAZzAY4kePqN32Jl+
+xj7vAV+kgKv58FGl/U78k7593kLhi6l5Qq3FifObyAzMixHJn61SbaAj9owK11NG
+nrMzz8JT/KPFyT9jGVMablis7SvHzd/ssUaHQcgaHb66WLe6M0pBlO60EHrj1bih
+Bp8ZfJm4oTrmWfYEt/M3ah3v/61cqgGEw3ywTAA9Bm/8SKhE78jhzcSm833irbyv
+sesG3RMYSlJQoOz6j7ADKKKamxlAkrtFBfKjBH8tyP7AzSkE741Vv17MKb1XjvW4
+jXzK/fwX+F3zkcWTM+oTDntTqT4c40Em6KKtmR/dz1z1w6rBKcfsSfWxIBBN/Shw
+kwryGEFK8TTN2sX5nvWp1qo8ORDcpckfqb7DcCDt4wZmlIlywn7RL8TjPEdDdvsV
+vCzrhA7lv3pagrNp9Lkk
+=VTtx
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/reduce/metadata.xml b/sci-mathematics/reduce/metadata.xml
index 523cb94a8164..4c137a0f4067 100644
--- a/sci-mathematics/reduce/metadata.xml
+++ b/sci-mathematics/reduce/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<maintainer>
-  <email>grozin@gentoo.org</email>
-  <name>Andrey Grozin</name>
-</maintainer>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
 A general-purpose computer algebra system.
 Powerful, mature and efficient.
 </longdescription>
diff --git a/sci-mathematics/reduce/reduce-20110414-r1.ebuild b/sci-mathematics/reduce/reduce-20110414-r1.ebuild
index 7d637a47789b..13b184cfaf1e 100644
--- a/sci-mathematics/reduce/reduce-20110414-r1.ebuild
+++ b/sci-mathematics/reduce/reduce-20110414-r1.ebuild
@@ -1,21 +1,28 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/reduce/reduce-20110414-r1.ebuild,v 1.1 2011/12/22 12:23:04 grozin Exp $
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/reduce/reduce-20110414-r1.ebuild,v 1.2 2015/03/21 20:51:37 jlec Exp $
+
+EAPI=5
+
 inherit elisp-common multilib
 
 DESCRIPTION="A general-purpose computer algebra system"
-HOMEPAGE="http://reduce-algebra.sourceforge.net/
+HOMEPAGE="
+	http://reduce-algebra.sourceforge.net/
 	http://reduce-algebra.com/"
-IUSE="doc emacs gnuplot X"
 SRC_URI="mirror://sourceforge/${PN}-algebra/${PN}-src-${PV}.tar.bz2"
-LICENSE="BSD-2 X? ( LGPL-2.1 )"
+
 SLOT="0"
+LICENSE="BSD-2 X? ( LGPL-2.1 )"
 KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs gnuplot X"
 
-RDEPEND="X? ( x11-libs/libXrandr
+RDEPEND="
+	X? (
+		x11-libs/libXrandr
 		x11-libs/libXcursor
-		x11-libs/libXft )
+		x11-libs/libXft
+		)
 	gnuplot? ( sci-visualization/gnuplot )
 	emacs? ( virtual/emacs )"
 DEPEND="${RDEPEND}"
@@ -27,7 +34,7 @@ src_configure() {
 	# Therefore, I cannot use econf here
 	# Also, make calls configure in maintainer mode in subdirs *by design*
 	# The trunk sucks less => WONTFIX until the next release
-	./configure --with-csl $(use_with X gui)
+	./configure --with-csl $(use_with X gui) || die
 	# psl build requires Internet connection at build time
 	# we cannot support it
 }
@@ -36,7 +43,7 @@ src_compile() {
 	emake -j1 STRIP=true
 
 	pushd cslbuild/*/csl/reduce.doc > /dev/null
-	rm -f *.txt *.tex
+	rm -f *.txt *.tex || die
 	popd > /dev/null
 
 	if use emacs; then
@@ -46,18 +53,17 @@ src_compile() {
 }
 
 src_test() {
-	emake -j1 testall || die "emake testall failed"
+	emake -j1 testall
 }
 
 src_install() {
 	local lib="$(get_libdir)"
 	dodoc README BUILDING DEPENDENCY_TRACKING
 	pushd bin > /dev/null
-	cp "${FILESDIR}"/redcsl "${FILESDIR}"/csl .
-	sed -e "s/lib/${lib}/" -i redcsl
-	sed -e "s/lib/${lib}/" -i csl
-	exeinto /usr/bin
-	doexe redcsl csl
+	cp "${FILESDIR}"/redcsl "${FILESDIR}"/csl . || die
+	sed -e "s/lib/${lib}/" -i redcsl || die
+	sed -e "s/lib/${lib}/" -i csl || die
+	dobin redcsl csl
 	popd > /dev/null
 
 	pushd cslbuild/*/csl > /dev/null
@@ -67,18 +73,17 @@ src_install() {
 	doins reduce.img csl.img
 	insinto /usr/share/${PN}
 	doins -r ${PN}.doc
-	mv "${D}"usr/share/${PN}/${PN}.doc "${D}"usr/share/${PN}/doc
+	mv "${D}"usr/share/${PN}/${PN}.doc "${D}"usr/share/${PN}/doc || die
 	dosym /usr/share/${PN}/doc /usr/${lib}/${PN}/${PN}.doc
 	if use X; then
 		doins -r ${PN}.fonts
-		mv "${D}"usr/share/${PN}/${PN}.fonts "${D}"usr/share/${PN}/fonts
+		mv "${D}"usr/share/${PN}/${PN}.fonts "${D}"usr/share/${PN}/fonts || die
 		dosym /usr/share/${PN}/fonts /usr/${lib}/${PN}/${PN}.fonts
 	fi
 	popd > /dev/null
 
 	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/util/r38.pdf
+		dodoc doc/util/r38.pdf
 	fi
 
 	if use emacs; then
diff --git a/sci-mathematics/reduce/reduce-20110414.ebuild b/sci-mathematics/reduce/reduce-20110414.ebuild
deleted file mode 100644
index 29fb420bdd80..000000000000
--- a/sci-mathematics/reduce/reduce-20110414.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/reduce/reduce-20110414.ebuild,v 1.1 2011/09/22 11:15:33 grozin Exp $
-EAPI=4
-inherit elisp-common
-
-DESCRIPTION="A general-purpose computer algebra system"
-HOMEPAGE="http://reduce-algebra.sourceforge.net/
-	http://reduce-algebra.com/"
-IUSE="doc emacs gnuplot X"
-SRC_URI="mirror://sourceforge/${PN}-algebra/${PN}-src-${PV}.tar.bz2"
-LICENSE="BSD-2 X? ( LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~x86"
-
-RDEPEND="X? ( x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXft )
-	gnuplot? ( sci-visualization/gnuplot )
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# If you pass --prefix to this damn configure,
-	# make (not make install!) will try to install stuff
-	# into the live file system => sandbox violation
-	# Therefore, I cannot use econf here
-	# Also, make calls configure in maintainer mode in subdirs *by design*
-	# The trunk sucks less => WONTFIX until the next release
-	./configure --with-csl $(use_with X gui)
-	# psl build requires Internet connection at build time
-	# we cannot support it
-}
-
-src_compile() {
-	emake STRIP=true
-
-	pushd cslbuild/*/csl/reduce.doc > /dev/null
-	rm -f *.txt *.tex
-	popd > /dev/null
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile generic/emacs/*.el || die "elisp-compile failed"
-	fi
-}
-
-src_test() {
-	emake testall || die "emake testall failed"
-}
-
-src_install() {
-	pushd cslbuild/*/csl > /dev/null
-	exeinto /usr/lib/${PN}
-	doexe reduce csl
-	insinto /usr/lib/${PN}
-	doins reduce.img csl.img
-	doins -r reduce.doc
-	if use X; then
-		doins -r reduce.fonts
-	fi
-	popd > /dev/null
-	exeinto /usr/bin
-	doexe "${FILESDIR}/redcsl" "${FILESDIR}/csl"
-	dodoc README BUILDING DEPENDENCY_TRACKING
-	dosym /usr/lib/${PN}/${PN}.doc /usr/share/doc/${PF}/html
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/util/r38.pdf
-	fi
-
-	if use emacs; then
-		pushd generic/emacs > /dev/null
-		elisp-install ${PN} *.el *.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/64${PN}-gentoo.el"
-		popd > /dev/null
-	fi
-}