Various ebuilds fixes

19 files changed, 33 insertions, 35 deletions

diff --git a/dev-libs/ctpl/Manifest b/dev-libs/ctpl/Manifest
index 58b3313..bf66f22 100644
--- a/dev-libs/ctpl/Manifest
+++ b/dev-libs/ctpl/Manifest
@@ -1,2 +1,2 @@
-EBUILD ctpl-0.3.2.ebuild 639 RMD160 5d1b79b164b4e0adc78a680e3e1d27d5b9c402e7 SHA1 aa0f73223d71cddd6cf65aef1f91b72326582577 SHA256 a2c80f39bab32ffa3ea47599289a5709977648fdbbed1f13457bc63eb380aeac
+EBUILD ctpl-0.3.2.ebuild 638 RMD160 179de3a4b6cb1b491242cf85f0bfd8aaa64fc662 SHA1 d444d9efb365383b7350c10da6335a177d0ab9bf SHA256 fd7254fac91b97376b7b49bc4c4de0e5ae59a64f9ad5aa2777876a7af7c4399b
 DIST ctpl-0.3.2.tar.gz 560262 RMD160 750be5503dd6811f099116582c866fae6aefc721 SHA1 49a835768fb151406439128d8616c1ca8712d759 SHA256 5e0cbcc2b0dfcbcb512acce988a0c00705759cec5ec68bfd8310605b67283f04
diff --git a/dev-libs/ctpl/ctpl-0.3.2.ebuild b/dev-libs/ctpl/ctpl-0.3.2.ebuild
index a41ab0e..d426fac 100644
--- a/dev-libs/ctpl/ctpl-0.3.2.ebuild
+++ b/dev-libs/ctpl/ctpl-0.3.2.ebuild
@@ -25,7 +25,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die
+	emake DESTDIR="${D}" install || die
 	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
 	dodoc AUTHORS NEWS README
 }
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 540b943..f87ed7f 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -2,4 +2,4 @@ AUX libs.patch 1990 RMD160 f8546cc5f5ff0144b8f527b00691baaaa2f51c31 SHA1 fa9b036
 AUX nspr-4.6.1-config-1.patch 565 RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 SHA1 51f8e14107dc2edc951377991e9a7d08757d0f91 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6
 AUX nspr-4.7.0-prtime.patch 962 RMD160 a8c5598d07fb75550f946ec4105ade7128e4404e SHA1 aa731691e91691a66b6de0fdcf912f8e09a9b5a8 SHA256 b586ecb71bffa3b083a875d476792aa1f61a5126a9e6d5669c81034888d284a2
 AUX pkgconfig.patch 4026 RMD160 147bcc36fe2394a0c5c7cdc531c88cc18eada7c9 SHA1 ae34f19de86ab5fefd3e443864120db3c77bc7dc SHA256 2ea7b2584ee440b8bbd7ad89c7f71b8e1a5b97737e1e9e23c6b0f1055777a033
-EBUILD nspr-9999.ebuild 1881 RMD160 d4caf643b120796e5313cf95a49ab2501d24cba8 SHA1 fdab6e89dc2a06896588f16d7c221464d20edc75 SHA256 04ae0ea4e61fe13bbb590a3315654e5a047a6af66eff4875aebf4be12e87ce00
+EBUILD nspr-9999.ebuild 1880 RMD160 e76b2187e5a8822a854959602c42eadc246f039a SHA1 75c582766dae40399ae7bd72ec891be8f9858c77 SHA256 e24b18eab044142e0ca6f9a7af6e022f8a8d577a269c41f6844c7ab9f98127d5
diff --git a/dev-libs/nspr/nspr-9999.ebuild b/dev-libs/nspr/nspr-9999.ebuild
index a4b52c7..9945eb6 100644
--- a/dev-libs/nspr/nspr-9999.ebuild
+++ b/dev-libs/nspr/nspr-9999.ebuild
@@ -43,7 +43,7 @@ src_compile() {
 src_install () {
 	# Their build system is royally confusing, as usual
 	cd "${S}"/build
-	emake DESTDIR="${ED}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	if ! use static-libs; then
 		cd "${ED}"/usr/$(get_libdir)
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 6a78c2f..7133e64 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1 +1 @@
-EBUILD geany-9999.ebuild 1303 RMD160 36d17914c8eed6bb16e8188e1bd688f27a0b2ba7 SHA1 f4724dba6a94bf14e3dfb0786a18deaf073f5731 SHA256 51d2a5ef3e8f6664e78860a07fcd9b28ddfa5d8612a550e8e88745338e6dcb5d
+EBUILD geany-9999.ebuild 1303 RMD160 829469fc97bc410b971e5d046bc50954a13e7503 SHA1 eedf26aa41b61da279baf177723ee5593e8c125f SHA256 6fb72cea208a9c226193275297b5d34009dd41694cc3ce164397c2060ecf6968
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild
index 668c7d7..430a755 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -54,8 +54,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" DOCDIR="${ED}/usr/share/doc/${PF}" install || die
+	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install || die
 	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
-	rm -f "${D}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
 	prepalldocs
 }
diff --git a/eclass/mozilla-scm.eclass b/eclass/mozilla-scm.eclass
index 1512d8d..a4b0eec 100644
--- a/eclass/mozilla-scm.eclass
+++ b/eclass/mozilla-scm.eclass
@@ -114,7 +114,7 @@ function mozilla-scm_src_configure {
 ## src_install
 ##
 function mozilla-scm_src_install {
-	emake DESTDIR="${ED}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	local prefdir="${ED}/${MOZILLA_FIVE_HOME}/defaults/pref"
 	[[ -d "${prefdir}erences" ]] && prefdir+="erences"
diff --git a/x11-plugins/i3bar/Manifest b/x11-plugins/i3bar/Manifest
index 26afe54..9669ec6 100644
--- a/x11-plugins/i3bar/Manifest
+++ b/x11-plugins/i3bar/Manifest
@@ -1 +1 @@
-EBUILD i3bar-9999.ebuild 1095 RMD160 bb3f6f2805650a781f3d9369c7d551b5ca1c8c46 SHA1 4e0a616d311f214394a04033951cd7f05160ffe8 SHA256 ae22b1b517efa0c03b78001fea56db7d8623b84eb95dd002be290db7f4509255
+EBUILD i3bar-9999.ebuild 1013 RMD160 7fa6c06bdad0e0ab29ecbbd20a10d0010f01cfe5 SHA1 162ebe25d86166a99a0c932f569916c1db84ee0f SHA256 39a196a10c515ddf6ebfa6c86b3e0fc2b2594c33fb590f7c41df97a00404f93c
diff --git a/x11-plugins/i3bar/i3bar-9999.ebuild b/x11-plugins/i3bar/i3bar-9999.ebuild
index 59684ff..0e99f32 100644
--- a/x11-plugins/i3bar/i3bar-9999.ebuild
+++ b/x11-plugins/i3bar/i3bar-9999.ebuild
@@ -47,10 +47,10 @@ src_prepare() {
 
 src_compile() {
 	emake || die "emake compile die"
-	use man && { emake -C doc || die "emake man die" ; }
+	use man && emake -C doc
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die "emake install die"
-	use man && { doman doc/*.1 || die "doman die" ; }
+	emake DESTDIR="${D}" install
+	use man && doman doc/*.1
 }
diff --git a/x11-plugins/pidgin-libnotify+/Manifest b/x11-plugins/pidgin-libnotify+/Manifest
index a4be92c..b80d14c 100644
--- a/x11-plugins/pidgin-libnotify+/Manifest
+++ b/x11-plugins/pidgin-libnotify+/Manifest
@@ -1,3 +1,3 @@
-EBUILD pidgin-libnotify+-1.2.2.ebuild 823 RMD160 4b36397d020d39f0ca3c84a154b6e6a1946e5648 SHA1 74d88235182ecf97a4fb6e0ae46ba278105e2491 SHA256 b922d3fe3689ead2ae98946d67fab934b5e654647442e2e152177d48de2f85e8
-EBUILD pidgin-libnotify+-9999.ebuild 909 RMD160 1399122dcd2f75c3a35f39876b070defd26b3624 SHA1 140f7cbcb59d1f54e2d569776b373d87ce33c5c7 SHA256 f8898f407206a9f8332db17978ea2bda05d41c369ded6fbfaa4975583f45de60
+EBUILD pidgin-libnotify+-1.2.2.ebuild 822 RMD160 8057edec3314850e9a3c65a9130274e1a63c31dc SHA1 c174b5120e2075d3dcdf92c0c6fc30a708e3f4a5 SHA256 e3c95ea0fa388f1607bb3ae1d7b700863d18616fce53e68314a528bab3cd39c1
+EBUILD pidgin-libnotify+-9999.ebuild 908 RMD160 e076a648fa758fbe040bc29c5ec83ce1aedcac75 SHA1 cb49b5bcf818dc9d6320a18c0e47eaab713ee869 SHA256 d543baab0d06d4c3f477fbdae3b2145b021ad574f1ff0e8ffbe753022983b016
 DIST pidgin-libnotify+-1.2.2.tar.xz 228388 RMD160 b60d584d140cf237a8bbde665a4b7a6d27f059ca SHA1 7ad2afcc15b47637e5211c869c70bee8a6e73bb1 SHA256 e7b9be913ee795d05b1e7ce9696a5ccda1ac7d42fd859b6fed3db7372d4f2559
diff --git a/x11-plugins/pidgin-libnotify+/pidgin-libnotify+-1.2.2.ebuild b/x11-plugins/pidgin-libnotify+/pidgin-libnotify+-1.2.2.ebuild
index 721f52f..bf9975d 100644
--- a/x11-plugins/pidgin-libnotify+/pidgin-libnotify+-1.2.2.ebuild
+++ b/x11-plugins/pidgin-libnotify+/pidgin-libnotify+-1.2.2.ebuild
@@ -30,7 +30,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die
+	emake DESTDIR="${D}" install || die
 	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/x11-plugins/pidgin-libnotify+/pidgin-libnotify+-9999.ebuild b/x11-plugins/pidgin-libnotify+/pidgin-libnotify+-9999.ebuild
index e29cd85..2143b79 100644
--- a/x11-plugins/pidgin-libnotify+/pidgin-libnotify+-9999.ebuild
+++ b/x11-plugins/pidgin-libnotify+/pidgin-libnotify+-9999.ebuild
@@ -36,7 +36,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die
+	emake DESTDIR="${D}" install || die
 	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/x11-plugins/purple-presence/Manifest b/x11-plugins/purple-presence/Manifest
index 7c7224e..5a37ae9 100644
--- a/x11-plugins/purple-presence/Manifest
+++ b/x11-plugins/purple-presence/Manifest
@@ -1,3 +1,3 @@
-EBUILD purple-presence-0.6.ebuild 741 RMD160 52cf7c5e1b28923f13c765ac4a2caf603386f000 SHA1 ec1897750bf35d3d2a16c0d9168758743ad2d60f SHA256 af742ad6a1c55105229063109d18f554b149e1906a66e2b08af0dcdcf665ff4f
-EBUILD purple-presence-9999.ebuild 850 RMD160 cf582309f50421dfccac865ce4239bffc453347d SHA1 a958f29a38a7fbf036a9e6ce71c36bb38418b4e0 SHA256 61fa5eca5bb33550d7e0c67128b26e8c170b8aad141e244e28f838a3667a7f41
-DIST purple-presence-0.6.tar.xz 226960 RMD160 ffc0e7cbe83cb707a94797282ab4a1a906945e0d SHA1 c9824af307c3261e7624c6c8c8c096b6fcd9b38f SHA256 ad3fd92fa659ab540746bebb1020e180bb59cb004c66a074141f80ccbcd6fbcf
+EBUILD purple-presence-0.6.ebuild 739 RMD160 f1fd8306fe987af59e2dad60a683e5e06316eb5d SHA1 2a557883635f0f3ba43f79569dac08d49c2314a6 SHA256 4a61cb53624ce0b43bf78f28c0a3b5c59c873c4cf7b720683b554d170cf3a359
+EBUILD purple-presence-9999.ebuild 848 RMD160 02069033f498b3a045aea030464cb6b175526f2f SHA1 293c57d31ae3e98e81c2cff61cded848716fa008 SHA256 47a3d4429a72508b912cea785339a4ccb1f5b66035f047b952243cec5cf14ba4
+DIST purple-presence-0.6.tar.xz 226956 RMD160 32a6ba42544ee97d50abe1d3ec1b257250e29f03 SHA1 615180cd214f75ba5b175b9dd19e50a5022f9f87 SHA256 8905de86ef1d7878460ee6b69374876398b59332d2d104342c5950975e3bf9ad
diff --git a/x11-plugins/purple-presence/purple-presence-0.6.ebuild b/x11-plugins/purple-presence/purple-presence-0.6.ebuild
index edf086f..847ee26 100644
--- a/x11-plugins/purple-presence/purple-presence-0.6.ebuild
+++ b/x11-plugins/purple-presence/purple-presence-0.6.ebuild
@@ -28,8 +28,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die
+	emake DESTDIR="${D}" install || die
 	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
 	dodoc AUTHORS ChangeLog NEWS README
 }
-
diff --git a/x11-plugins/purple-presence/purple-presence-9999.ebuild b/x11-plugins/purple-presence/purple-presence-9999.ebuild
index 4b02302..8c5feb1 100644
--- a/x11-plugins/purple-presence/purple-presence-9999.ebuild
+++ b/x11-plugins/purple-presence/purple-presence-9999.ebuild
@@ -35,8 +35,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die
+	emake DESTDIR="${D}" install || die
 	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
 	dodoc AUTHORS ChangeLog NEWS README
 }
-
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index cd14337..8c0a505 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,5 +1,5 @@
-EBUILD i3-3e-r3.ebuild 1539 RMD160 fa0581637725e833521cdc56026da0d970bad001 SHA1 41556fd04f4e8cacdb451252011a81bce467c7ba SHA256 3030d242fa8bf1149bc9670d02312f210197035c5f233ae9e53bacec78eea788
-EBUILD i3-4_pre2.ebuild 1357 RMD160 98c74e22aafc595af5dd66a7bf647ccf6e7bd397 SHA1 7be8b812c82db3a041f71c3f452759b8d3cfe3c3 SHA256 7153f188dd758c9362ed9595ee736c6b7921c453372a159cbe624f823099e30c
-EBUILD i3-9999.ebuild 1398 RMD160 8f9f36a339701799f13f3720376764873c630fa4 SHA1 c56d09ee0c79223f451f73cd5ade1ef9c00f580e SHA256 47bcbb57ba3354bba0affaa219481b3001f5486c588239c0f241f6fcbeca443d
+EBUILD i3-3e-r3.ebuild 1538 RMD160 d33c04eda9cb3f69588796fda87232d91d9dbe6e SHA1 67f11b0edc1b1997fc4aa0904537168f4ecee61b SHA256 d10e00d8cf0c98534901fc50b81c6e774ad7998f9d0b8bd18544396733a20417
+EBUILD i3-4_pre2.ebuild 1356 RMD160 7a9c5e7efba4c558a7ef49f28027a7917e6cf496 SHA1 dbc7b11c66d04dbc28b4a4b48c1cf497611354bb SHA256 2a2a6637aa8657c43134c4309bb80a6b4e2da6e02d523fb7a717efa41cfb4146
+EBUILD i3-9999.ebuild 1220 RMD160 e0a6cdc71b226baba6888aeae18c41023ac317b0 SHA1 0a7924175d3f42a030bf0d573b75c4e0e1398ff7 SHA256 3d1521fe2e2442ae364ecd2fed4895a82df44cd23702dd957c5a50dcb5f00223
 DIST i3-tree-pr2.tar.bz2 395023 RMD160 8179253b14491988baf1fa4f307753a79da5a761 SHA1 0ab841ada18129bfe466d9e4cd7f7e35e2dd7ccc SHA256 b7a4d983a7bc0893182fd71de328a504e6f525778f67791ae0458eb4a1c13460
 DIST i3-3.e-bf3.tar.bz2 360704 RMD160 858d92020e251b3afd34bcb0008d7ccc25d04669 SHA1 7c35f49fa14a21b606bb102b41c5f0cead4e93a3 SHA256 e0a7b030ebbad0ebf2ac39f235dd5e0ad34ef0ff5b83e31501a361f92e85c68f
diff --git a/x11-wm/i3/i3-3e-r3.ebuild b/x11-wm/i3/i3-3e-r3.ebuild
index b0b44dd..0c5919f 100644
--- a/x11-wm/i3/i3-3e-r3.ebuild
+++ b/x11-wm/i3/i3-3e-r3.ebuild
@@ -60,7 +60,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die "emake install die"
+	emake DESTDIR="${D}" install || die "emake install die"
 	doman man/*.1 || die "doman die"
 	dodoc GOALS TODO || die "dodoc die"
 	if use doc; then
diff --git a/x11-wm/i3/i3-4_pre2.ebuild b/x11-wm/i3/i3-4_pre2.ebuild
index da4332e..4aac781 100644
--- a/x11-wm/i3/i3-4_pre2.ebuild
+++ b/x11-wm/i3/i3-4_pre2.ebuild
@@ -52,7 +52,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die "emake install die"
+	emake DESTDIR="${D}" install || die "emake install die"
 	doman man/*.1 || die "doman die"
 	dodoc GOALS TODO || die "dodoc die"
 	if use doc; then
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 5c79aba..1fc294d 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -50,17 +50,17 @@ src_prepare() {
 }
 
 src_compile() {
-	emake || die "emake compile die"
-	use man && { emake -C man || die "emake man die" ; }
-	use doc && { emake -C docs || die "emake docs die" ; }
+	emake
+	use man && emake -C man
+	use doc && emake -C docs
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die "emake install die"
-	use man && { doman man/*.1 || die "doman die" ; }
-	dodoc GOALS TODO CMDMODE || die "dodoc die"
+	emake DESTDIR="${D}" install
+	use man && doman man/*.1
+	dodoc GOALS TODO CMDMODE
 	if use doc; then
-		dohtml -r docs/*.html || die "dohtml die"
+		dohtml -r docs/*.html
 		elog "Documentation in html is in /etc/share/doc/${P}"
 	fi
 }