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, 48 insertions, 53 deletions

diff --git a/sci-electronics/eagle/ChangeLog b/sci-electronics/eagle/ChangeLog
index dae0505cf1af..a881ebf8f0c7 100644
--- a/sci-electronics/eagle/ChangeLog
+++ b/sci-electronics/eagle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/eagle
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.64 2015/02/07 14:06:42 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.65 2015/03/21 20:47:33 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> eagle-4.16_p2-r2.ebuild,
+  eagle-5.11.0.ebuild, eagle-5.12.0.ebuild:
+  use dobin instead of exeinto /usr/bin/ && doexe
 
   07 Feb 2015; Christian Ruppert <idl0r@gentoo.org> eagle-7.2.0.ebuild:
   Fix dependencies, bug 531746
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index 0bbf818da825..0754fba3e36d 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX eagle_wrapper_script 247 SHA256 a34c628f4e8bceefc6f08fa2c0a74888fa660e4fc0bd669b8092476581db2758 SHA512 a347dc4f4ec8f369ff6a1beb8eaf3dfc9f4d8c2de3fe8b33b0f662cfb469905b17a72d5273c4627bc8a3fee9ef650654d1d654d33ea3a01c4f9a2ef57961256d WHIRLPOOL 484ed620093a8934c91bff80016d39a8b5fdfce93460d0e4d6d032a35f44b6c15f7e139633a6a5d0176db8cf8a342d4102e118d4a54c13fa3c7a12f06477a8ef
 DIST cadsoft_eagle_manual-eng-2006.12.13.pdf 1875608 SHA256 805fbef15bd4584f6a976d8a2cc672f00ce3ad32d018ce53b7c9ce80b9965733
@@ -11,22 +11,30 @@ DIST eagle-lin-7.1.0.run 44697003 SHA256 1fa56d1185c6a993224020786bc21ce1f171566
 DIST eagle-lin-7.2.0.run 45324128 SHA256 567caf2bdeacff17eea33ef5e083fda534706688f145a9f3035ce48547834e94 SHA512 6c1bd4b6d90baa6793fd8de465b827be30e33f96472b7715c68c4645ddbd2ecaced58065fffabccfd8537a6921fbd0b1a752d0a123477f01d9363cdad8fc12d3 WHIRLPOOL 84171ba8b2bdbdfee117a40d50b62aa56e835c3f72ad4f768538f2426744dcb01ad14853fb07b7bbc674065c41af713f26b5d51ae178b1793a54cb6159eaa997
 DIST eagle-lin-eng-4.16r2.tgz 8922532 SHA256 dc71102780621022c5f3b124bbcde075f23d3e04d624a2985afa733fbae8c7e4
 DIST eagle-lin-ger-4.16r2.tgz 9018957 SHA256 6c570e41668da23e1f473da3bfd879cbeb76bea02d35ae13970db48b3aa36259
-EBUILD eagle-4.16_p2-r2.ebuild 2828 SHA256 16aa33f5f429750b551d4756f7d596c66d21610cd687530037143681992c3f58 SHA512 4ba96068d1630333f9764a11415f58623d958d94618526a052ba6016f101428bfebd59a811fccfb8a77a67d93fb424cd500ec6586f76fd96070a308c9d749088 WHIRLPOOL 4db7dc5b688defee17c4c87a76a8afc29483e25ebba4d333998f16fffffe50d74ee2fe29c9b2f64a7c12098014d4d35de0ff68b9918ed18d2131d571b278a34b
-EBUILD eagle-5.11.0.ebuild 3307 SHA256 6bddd962630f247f491e17468ab6ec5c0c26211a08477aedcfede292bbd88ba5 SHA512 4d426943235a64a803b375e005c563ca23430acc468436d8a87d1e4fff32a36617a71e99be50fb3c9d8f6b47c6c346eac2e2bd473c5d0644714284629718f330 WHIRLPOOL fe89a53352db60d26783390ba44062b92c1f68b24d7c4c2fb1eaa97a80c30955fc388c078e9d32cf6c6c6ccb18122a197f538198ebdd97639f5389a18959330b
-EBUILD eagle-5.12.0.ebuild 3522 SHA256 ade63505ea84b2042869ee0d89ca4cd328e5d2bdc80a1ec44ed8006191f5ae0b SHA512 724b5010bc90929cef337504e1731de12fce1acd5c55d717275d1a6fc12b6def2befc1c3774541fa36bfc2ca4412ad8f7edab7a5b7dcce55794c5a089725974b WHIRLPOOL a78658452fe3f28f3803b7b0d085c833441a687112d514fe7cc2923a25dfb638172676d346e5173768dbdbf16c3d4e63c8e07b05090cb7566a20fd5f3fd229a7
+EBUILD eagle-4.16_p2-r2.ebuild 2809 SHA256 46adf64916bc85d53923423f15bd4cc7ef2e2a6da0c56abd31f24ea1185b9b7a SHA512 465d951c1a7dcd56370e6599ada29f12e9cb0d5143e80248fa474cba9d01f56d8ee03045f2d86e35529b14e166f93fdb74629333bba21b25004494682c082e31 WHIRLPOOL 2479d0fb4902865dad064a6f244025a7997bb38996a3f011caa095e45d60edf9d1b010b09648b5913515ad491c01bf3ba2613002e9a4ad21821412054b224a10
+EBUILD eagle-5.11.0.ebuild 3306 SHA256 37154df8d28df97aa331637516218e61440b35d7b02020a059f57267f8ad9e1b SHA512 bb3d8b47a3173e43e3849bf8e67bb22d826d4ae1b1dbfefceb9e99897562a76a665725fcb8d0ce6a8a53c463abfd03bd2ba2a43b8bc3900835f6983e5cff9eb9 WHIRLPOOL 90e29922f1d59af578fbbba40caafdd695f2731cbdcbdecca986e9426ef4ff71cc99d535615e6486b75b3888f66b3fb3db272147062499fa4ef3c7c890006d3d
+EBUILD eagle-5.12.0.ebuild 3526 SHA256 7e41a37abebaaf9fc2236dc7cb20932197b659f3d5cceb5032d035fa8f0ce5bb SHA512 dcf7d201926b864b3822514c6c86d722898fcbaed506187038d45cc9dd7b6c04616e4f53864ad886d0a29e212c09beddd303ea874e8442bbf0b29fddf95b741b WHIRLPOOL fa9a746ae4dbe250a6a584d9c2ff68c92466d97712b91af74ea9637d5b79cb7d9732b25ab10b7cf57bddd6ee31fbecf27b6816996e185342fa48d43311ddb3be
 EBUILD eagle-6.6.0.ebuild 3461 SHA256 4c8994f1cdd513ccd91120620c89faf5ad5b3d5d9f38d635d1fad8f109f29ea9 SHA512 57d14d7c7e6ca33186f8526bedfed20e040d27bcda1f9204d52ae8810ab7f31f67a090b4f8c21154bc70d6b6a93b2ca35600dec9547ff4bcdd45b013ef73f4f5 WHIRLPOOL 9c8e46f8211e9212c8842878c9cdb8d8f4956db36004c75619a57c148765e3ee2e80c3e9c92f82061d98f2105820ccc331d00fde91e6acb4680cabf805b3ee72
 EBUILD eagle-7.1.0.ebuild 3463 SHA256 db5939dfbbeb15d77cf93d9f286f19f2f6a93f07434ef3e967553cbf03ad7b09 SHA512 85c25e050b4087894d15c0545d676317d9e876f51c511435b329d35a53327f0d821805b42dae4b704ad93efce5b96a55fc200b0af2b1cb8dfb844969582d98a5 WHIRLPOOL 850e88fcabb9528de6a99dbc1e4b0cc35050dda53568262aaeb868b645263f3c61ad917377c20c09ae38bc910671d078a920e62fbefd30acd0df383b50fe45ce
 EBUILD eagle-7.2.0.ebuild 3338 SHA256 6b092ba69d44539593adffb28b9862b6d7666a63faafc85df4ebc62d94e13cd7 SHA512 aaa2ce7a77ae3c7803194c3cfa40f23db2533127861ec9615979955366de87ed14c66d461c8653b625b079d2b523c524edf4aa31f5f136407cf37e177b3231d7 WHIRLPOOL 8425befcb4cdec05b6bdb7ac1d2c15a4a11b812be44eb22d9f6d0eb456e6dd703832314351914a9e81d896cfefd253306987b5e680ec661b6bda0e6be1ee758e
-MISC ChangeLog 10600 SHA256 5eecf16fd1520c9b005acaeea6e65f916b2457174fd6340cfae2eb8f34de3e1e SHA512 12926d6287484b2a8c057e4eb852d269f5f0f8409f27e33c3bfc6e7e6ceb2a3011c390529a81080384eda2024676ff1f090bade2c47c448c5cf8b288075478ce WHIRLPOOL 63042da947d2fd9ffa109a0e7faa683a8628c0295d822423ae945cd52aae73291c54c83ce0eb3095d1f7f8bdfbeab1f5c35c7ef71d4a6664712dd2a03b2b84ed
+MISC ChangeLog 10766 SHA256 88faf378b0990600844cdda004e1b474138730cfdbe0f97db50daed695f64f0f SHA512 03869771cdb79529b984c35921e52a53aa38a09c4c6d9dc3a7878b89b0071b9c9ab372df03e11369b3be189470576a9a978ad446be59ddb134eacce0f883acec WHIRLPOOL 1e81b6ca72b88a7dc637e037c1189d8a7906c5e6de679d8d3cddfd06050b9257afa371d32250fc804e2d7aa36c1ad2179f043e173ad5d3b44c7c6975c9a537eb
 MISC metadata.xml 667 SHA256 e2b23272a937a4e4f89bf9f5af1be0cca6d5decee0041698c0b65f3ab1b9cd1c SHA512 8cae35fa452b5dbc51e4a5f5efd8c7927720b614f6f70579c5778f79f241ef71025af9240f723f11a4694229bb679a8f9b6effbb5516c2f6e593fcd518e44c9a WHIRLPOOL a9c92b8d95068b0f2cd7fe5b10b567ddeabeafaaff22aab26b44579d1ca9f00b43630a966bf9a2426a43c672db8780d32cc0a008655394c8b9b6b63feacc0625
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJU1hv3AAoJEMOx0zmdw4Z1HEsH/2MuB7sGduwNUVOitSkgzCyW
-/2Wuh/yT1PBf980uecWFf2tulufezQsKAuSc8ftIaY2eyaG+2RqM2Y1fw8pDBjuT
-hEW/RXGKmdFGVknfZmqErE6qvG4jUjkGE3wIN+ribR48H/XQzd0j8Xb1GF5/fPHE
-8iQX8SldUKCrPpR9lo+Hoh9XBHYjqBIIxfp+jEylAw+VuzbYO5PMFKOfG6x1UU76
-H+ig6SUycTwNvJdKUoX0MGrT3SZYK/byPCEo3FglGmkBb/JK1Oo5EvcVUSxGJwGX
-MR7rtZl2Vt4bB901n9v4zDW8VNGVzfbs1CeTfLujdVqKgkrTykQYadD/g//IPfs=
-=hGWX
+iQJ8BAEBCgBmBQJVDdjmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir3KEP/RthrMcpwW0fpz/rsKEQc9JJ
+p52JqhKPj09i1uWghGajekyKPCfjn6Eb5yVP/PhpRwPbdYUn+ESpamgvjANpUOHJ
+EeEs370NB/pf5vLJFLwMRcRw3ams7eGFem8gAop7FCV2AwJRQI45u6C3/krwi9Zv
+K1Q+yKQs7779opYJOwj8hAhKZweXgubBONh8hH+fzPbsr+e75Zc9iEprFHR39jfi
+h4D3GBuv5NVWBJ6GndKJ+zCaKeQ/EP46eEjiCx0GLxNy2EWL8zSgRuCn2o8bPaHN
+91l4vDdXwTIFWG7pTt+DzjHo4gmxEfRt/dMxN2rbdsxTxqEeTdBxF+fGfc4VWzGc
+gdS2tCHrrFBsgbkQbhfiMo0Hm8c1Nfe7caFgS+b6We1OeOS7h29Ee+V6b+wlInas
+VlBlusMHPGDDiqFQ0DTOs+jgii7eyoX6J5Z3BTYvblTdR1XgNH4TIkcZYZVevffx
+c1VYag43+OaPy3ffYVKBVhsQh1WB97uRswZ/VzEAa1NpPe5jRjZDdnPLmSlQQjgD
+v2TlSdnlU/s7D3prajC1mjfEMAt1jnDAX9TK9bYfan4X4c/4IJ03nkP5PAVYv2Zz
+smvmVbHVgm6PHzVOQp2Gl9oQOrSkrzeYYoFFM6rxN3NurnXbDKyVBkWFNe4+Rk2m
+jwKw6ZE7ElOydJEQmDT8
+=ilcP
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild b/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild
index c5fdfc327ed6..f4f1a6245f7c 100644
--- a/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild
+++ b/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild,v 1.7 2014/10/15 21:05:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild,v 1.8 2015/03/21 20:47:33 jlec Exp $
 
 EAPI=5
 
@@ -58,23 +58,19 @@ MY_P=${PN}-lin-${MY_LANG}-${MY_PV}
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
-
 	unpack ${MY_P}.tgz
 	use doc && cp "${DISTDIR}"/${MANFILE} "${S}"
 
 }
 
 src_install() {
-
-	cd "${S}"
 	dodir ${INSTALLDIR}
 	# Copy all to INSTALLDIR
-	cp -r . "${D}"/${INSTALLDIR}
+	cp -r . "${D}"/${INSTALLDIR} || die
 
 	# Install wrapper (suppressing leading tabs)
 	# see bug #188368 or http://www.cadsoft.de/faq.htm#17040701
-	exeinto /usr/bin
-	newexe "${FILESDIR}/eagle_wrapper_script" eagle
+	newbin "${FILESDIR}/eagle_wrapper_script" eagle
 	# Finally, append the path of the eagle binary respecting INSTALLDIR and any
 	# arguments passed to the script (thanks Denilson)
 	echo "${INSTALLDIR}/bin/eagle" '"$@"' >> "${D}/usr/bin/eagle"
@@ -85,7 +81,7 @@ src_install() {
 	# Conditionally install the user's manual
 	use doc && cp ${MANFILE} "${D}/usr/share/doc/${PF}"
 	# Remove docs left in INSTALLDIR
-	rm -rf "${D}${INSTALLDIR}/{README,install,${MANFILE}}" "${D}${INSTALLDIR}/doc" "${D}${INSTALLDIR}/man"
+	rm -rf "${D}${INSTALLDIR}/{README,install,${MANFILE}}" "${D}${INSTALLDIR}/doc" "${D}${INSTALLDIR}/man" || die
 
 	echo -e "ROOTPATH=${INSTALLDIR}/bin\nPRELINK_PATH_MASK=${INSTALLDIR}" > "${S}/90eagle"
 	doenvd "${S}/90eagle"
@@ -97,9 +93,7 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	elog "Run \`env-update && source /etc/profile\` from within \${ROOT}"
 	elog "now to set up the correct paths."
 	elog "You must first run eagle as root to invoke product registration."
-
 }
diff --git a/sci-electronics/eagle/eagle-5.11.0.ebuild b/sci-electronics/eagle/eagle-5.11.0.ebuild
index 6efde0b2aeff..a8ce3bc7b7a8 100644
--- a/sci-electronics/eagle/eagle-5.11.0.ebuild
+++ b/sci-electronics/eagle/eagle-5.11.0.ebuild
@@ -1,6 +1,6 @@
-# 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/sci-electronics/eagle/eagle-5.11.0.ebuild,v 1.6 2014/10/15 21:05:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.11.0.ebuild,v 1.7 2015/03/21 20:47:33 jlec Exp $
 
 EAPI=5
 
@@ -50,54 +50,47 @@ esac
 DOCS="README_${MY_LANG} UPDATE_${MY_LANG} library_${MY_LANG}.txt"
 
 src_unpack() {
-
 	# Extract the built-in .tar.bz2 file starting at __DATA__
 	sed  -e '1,/^__DATA__$/d' "${DISTDIR}/${A}" | tar xj || die "unpacking failed"
-
 }
 
 src_install() {
-
 	# Set MY_LANG for this function only since UPDATE_zh and README_zh
 	# don't exist
 	[[ ${LINGUAS} == *zh* ]] && MY_INST_LANG="zh" || MY_INST_LANG="${MY_LANG}"
 
-	cd "${S}"
 	dodir ${INSTALLDIR}
 	# Copy all to INSTALLDIR
-	cp -r . "${D}"/${INSTALLDIR}
+	cp -r . "${D}"/${INSTALLDIR} || die
 
 	# Install wrapper (suppressing leading tabs)
 	# see bug #188368 or http://www.cadsoft.de/faq.htm#17040701
-	exeinto /usr/bin
-	newexe "${FILESDIR}/eagle_wrapper_script" eagle-${PV}
+	newbin "${FILESDIR}/eagle_wrapper_script" eagle-${PV}
 	dosym eagle-${PV} /usr/bin/eagle
 	# Finally, append the path of the eagle binary respecting INSTALLDIR and any
 	# arguments passed to the script (thanks Denilson)
 	echo "${INSTALLDIR}/bin/eagle" '"$@"' >> "${D}/usr/bin/eagle-${PV}"
 
 	# Install the documentation
-	cd doc
+	cd doc || die
 	dodoc ${DOCS}
 	doman eagle.1
 	# Install extra documentation if requested
 	use doc && dodoc elektro-tutorial.pdf manual_${MY_INST_LANG}.pdf tutorial_${MY_INST_LANG}.pdf
 	# Remove docs left in INSTALLDIR
-	rm -rf "${D}${INSTALLDIR}/doc"
-	cd ..
+	rm -rf "${D}${INSTALLDIR}/doc" || die
+	cd .. || die
 
 	echo -e "ROOTPATH=${INSTALLDIR}/bin\nPRELINK_PATH_MASK=${INSTALLDIR}" > "${S}/90eagle-${PV}"
 	doenvd "${S}/90eagle-${PV}"
 
 	# Create desktop entry
-	mv bin/${PN}icon50.png bin/${PF}-icon50.png
+	mv bin/${PN}icon50.png bin/${PF}-icon50.png || die
 	doicon bin/${PF}-icon50.png
 	make_desktop_entry "${ROOT}/usr/bin/eagle-${PV}" "CadSoft EAGLE Layout Editor" ${PF}-icon50 "Graphics;Electronics"
-
 }
 
 pkg_postinst() {
-
 	elog "Run \`env-update && source /etc/profile\` from within \${ROOT}"
 	elog "now to set up the correct paths."
 	elog "You must first run eagle as root to invoke product registration."
@@ -107,5 +100,4 @@ pkg_postinst() {
 	ewarn "with versions prior to 5.0!"
 	ewarn
 	ewarn "Please read /usr/share/doc/${PF}/UPDATE_${MY_LANG} if you are upgrading from 4.xx."
-
 }
diff --git a/sci-electronics/eagle/eagle-5.12.0.ebuild b/sci-electronics/eagle/eagle-5.12.0.ebuild
index 335e6eedb7f6..cedceeabb680 100644
--- a/sci-electronics/eagle/eagle-5.12.0.ebuild
+++ b/sci-electronics/eagle/eagle-5.12.0.ebuild
@@ -1,6 +1,6 @@
-# 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/sci-electronics/eagle/eagle-5.12.0.ebuild,v 1.2 2014/10/15 21:05:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.12.0.ebuild,v 1.3 2015/03/21 20:47:33 jlec Exp $
 
 EAPI="5"
 
@@ -8,14 +8,13 @@ inherit eutils
 
 DESCRIPTION="CadSoft EAGLE schematic and printed circuit board (PCB) layout editor"
 HOMEPAGE="http://www.cadsoft.de"
+SRC_URI="ftp://ftp.cadsoft.de/eagle/program/${PV%\.[0-9]}/${PN}-lin-${PV}.run"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="doc linguas_de linguas_zh"
 LICENSE="cadsoft"
 SLOT="0"
 
-SRC_URI="ftp://ftp.cadsoft.de/eagle/program/${PV%\.[0-9]}/${PN}-lin-${PV}.run"
-
 QA_PREBUILT="opt/${P}/bin/eagle"
 
 RDEPEND="
@@ -64,35 +63,33 @@ src_install() {
 	# don't exist
 	[[ ${LINGUAS} == *zh* ]] && MY_INST_LANG="zh" || MY_INST_LANG="${MY_LANG}"
 
-	cd "${S}"
 	dodir ${INSTALLDIR}
 	# Copy all to INSTALLDIR
-	cp -r . "${D}"/${INSTALLDIR}
+	cp -r . "${D}"/${INSTALLDIR} || die
 
 	# Install wrapper (suppressing leading tabs)
 	# see bug #188368 or http://www.cadsoft.de/faq.htm#17040701
-	exeinto /usr/bin
-	newexe "${FILESDIR}/eagle_wrapper_script" eagle-${PV}
+	newbin "${FILESDIR}/eagle_wrapper_script" eagle-${PV}
 	dosym eagle-${PV} /usr/bin/eagle
 	# Finally, append the path of the eagle binary respecting INSTALLDIR and any
 	# arguments passed to the script (thanks Denilson)
 	echo "${INSTALLDIR}/bin/eagle" '"$@"' >> "${D}/usr/bin/eagle-${PV}"
 
 	# Install the documentation
-	cd doc
+	cd doc || die
 	dodoc ${DOCS}
 	doman eagle.1
 	# Install extra documentation if requested
 	use doc && dodoc elektro-tutorial.pdf manual_${MY_INST_LANG}.pdf tutorial_${MY_INST_LANG}.pdf
 	# Remove docs left in INSTALLDIR
-	rm -rf "${D}${INSTALLDIR}/doc"
-	cd ..
+	rm -rf "${D}${INSTALLDIR}/doc" || die
+	cd .. || die
 
 	echo -e "ROOTPATH=${INSTALLDIR}/bin\nPRELINK_PATH_MASK=${INSTALLDIR}" > "${S}/90eagle-${PV}"
 	doenvd "${S}/90eagle-${PV}"
 
 	# Create desktop entry
-	mv bin/${PN}icon50.png bin/${PF}-icon50.png
+	mv bin/${PN}icon50.png bin/${PF}-icon50.png || die
 	doicon bin/${PF}-icon50.png
 	make_desktop_entry "${ROOT}/usr/bin/eagle-${PV}" "CadSoft EAGLE Layout Editor" ${PF}-icon50 "Graphics;Electronics"
 }