revert previous D to ED commit and use PREFIX variable to make a better support for Prefix

Package-Manager: portage-2.2.0/cvs/Linux x86_64

5 files changed, 19 insertions, 11 deletions

diff --git a/app-text/zathura-ps/ChangeLog b/app-text/zathura-ps/ChangeLog
index 8e3a0c8d3e89..833f27514408 100644
--- a/app-text/zathura-ps/ChangeLog
+++ b/app-text/zathura-ps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/zathura-ps
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/ChangeLog,v 1.16 2013/08/14 01:58:01 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/ChangeLog,v 1.17 2013/08/14 11:13:10 heroxbd Exp $
+
+  14 Aug 2013; Benda Xu <heroxbd@gentoo.org> zathura-ps-0.2.0.ebuild,
+  zathura-ps-0.2.1.ebuild, zathura-ps-0.2.2.ebuild:
+  revert previous D to ED commit and use PREFIX variable to make a better
+  support for Prefix
 
   14 Aug 2013; Benda Xu <heroxbd@gentoo.org> zathura-ps-0.2.1.ebuild,
   zathura-ps-0.2.2.ebuild:
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index ac7d325e8dbb..1df9557f5de1 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,9 +1,9 @@
 DIST zathura-ps-0.2.0.tar.gz 5004 SHA256 717eda01213b162421b6b52f29d6b981edc302fddf351ccb2c093b6842751414 SHA512 b4a06bf1cdce7da056106f67924068598260d5fb5ffc93015c9e4c2c8ee16ecaf774702910eddf4724ac59b8d9340158d56f746e5a8a6597897887ff9f980dcf WHIRLPOOL ad40cfd9b44a283c68efce12d87d5ed1d6036257fd3cfbebe4b7f808e14d7923761d783d5e20ff55d61c8350ba81ab6fa0fe0992a8e60abbd3c6db705354f9f3
 DIST zathura-ps-0.2.1.tar.gz 5057 SHA256 01f6a8953d0a1b94b51ff46ac8955b54b1aa6789044e1e34f1d6dbccf94eaee5 SHA512 c039158819e22c0af5271002e12112146c49e7a312c3edfa43f5ef3b4db31b0987c642f06186b85ec5255a5237b5f607bda5c6750e0ae8d6ee39703836cd85d7 WHIRLPOOL 57d7e8b6a97e7745e2514cbf339c0d6df8eaec5f487955cfafbc40a1691654269ee55bba102dcfce031e74e27d65462180849b028e99fa295cc094dfa9114ea6
 DIST zathura-ps-0.2.2.tar.gz 5793 SHA256 e6546261db03b0b6b6499a8e109dc9ff3b8eb8b154ce45f5c6284c1e76d1d7a8 SHA512 4cedd614127b995ad834d5913dd5d9b3dff6172ac31cf42e8d43941815ac03a4872f41d7766c325f435feffa63364c9c377f760cd0540d2f36753e7df1c4c49e WHIRLPOOL 246f7cede9096474efab0c1b4f25bbd4b908eeb1a3a995d390939c02b79ca2adcce86582fd4129189b20e9028f6c0e9079c674cc1beebc59844b8b3d5597b76c
-EBUILD zathura-ps-0.2.0.ebuild 897 SHA256 a88afa1f63ddbb4835e805a3ca91fbadf6caebbf581a39c75638ac132714806b SHA512 0348f63e35bbfc88ce47f044be0b4121dfb993a4c5044d4349d7e8ef0738d79709ba72eff8278a7fe4791ff72237ca3f1f7dab9649462788ff34ae9ff6af35cf WHIRLPOOL 01742cfb65e2c5967179d45e6b8fe9913b9ccdaa3c4947767de4afcacdc2f72c657612df4b15343ba235950a7a94e826535993b93ef8af3f62acceca8ea28485
-EBUILD zathura-ps-0.2.1.ebuild 897 SHA256 07a4c5741e77d2ffb929f34484c3d1e7b0c8c590181a26ed2f61ac805cc07303 SHA512 f4ffc6a05afe01389343d1488d00261898a800a5bf885ed666614fa9676f9f83392cd49bf5551100bd3bbb1bcfe3b29c0d5224dc01bfdaef6c4041dd02aa1a97 WHIRLPOOL 87d5ecee4a37084bf92ac77a6436df2aebf66990d78f78e214bd85846c1cdb5d61fa91662b1cc7773c2352e931ce72b4a0a7e91323a1f5fcf3195477f228b996
-EBUILD zathura-ps-0.2.2.ebuild 920 SHA256 f220d3a96e5cc2c424bbb8af17e931895699ae7b361c6874233ce5f4a46ca1d0 SHA512 39a636db094d994aa2a4e11f2a40ecd4bf7bf1dc24ebd67aa1299e7fc294778bd8d360e3a12641e64efb063223c2d16992202d1215c5835a3843d6d8a1ae1f8f WHIRLPOOL 53963196c0272ea4ee4460e7750bad81c7dc6056e08b0a9aa9745ab8ba329bb5f7eb81d777f8d1a43e0395edcd3e9655c852eb80dca6aa6224fba6790d567f28
+EBUILD zathura-ps-0.2.0.ebuild 920 SHA256 dc4f38cf097ec2566cd01e47eeeb698acf09a57467a8f851bd2e9a3b39bc91d7 SHA512 d8c3b3bd0579eff3ffc7eb76653f4c43fd9b34aa38628f0ffca94962d28a802bfcc8bdb3de426b626f1e43d117ac41e271becfb68da3c9441f434f5e84011967 WHIRLPOOL 54062315d30eb27b8fea9a42c84eb0ef80d8983c7995445191a7ea4dc8c0130c6b2243cf50b976ac59d39f4bd33527368a5b23a38a5f9111d94318b9af1fd087
+EBUILD zathura-ps-0.2.1.ebuild 922 SHA256 30790a5989932dedf5d454623c874c4253212a2cb73e6de6f9628a1135801a5d SHA512 6d21190303dbac56d94d25b0c46fdadd4a289cf763d0038943bc4d7bcd9ebb12fd5b4d77061de69b0e71c5dfd6f40cbf83c551ce31fb90220cc92387292cd846 WHIRLPOOL 764643979e3c6e3310bad8ea5e8ea5ba27ac2b51381d88bc2bf24e0b026f284b6feb9a6efd928fc776c3e8973722144ecbc6a7a31d78677e64f65bbca94d383b
+EBUILD zathura-ps-0.2.2.ebuild 945 SHA256 5114ea9c0edfc92ca3a7f256509cb0b47e81a93ef5ea0955656e31d0c983e014 SHA512 09e00ad5f6b8bd9465622f735a0fad18da97d9dec829300d0628bf13d6ad08c960f8557f587816477427165a3ed0bc78c67c5fe36de9242e27a5f4aac1e8dff0 WHIRLPOOL efc9a304713716b065f35b60ca861f82ce4f5805af7dfa7d82946cd0f6d945d8a8b9a52f5cccb1804e800a661b73fb0fd184ce05b3fa921cbb60339b17eee390
 EBUILD zathura-ps-9999.ebuild 899 SHA256 597aabe61b301c89ad5c4db61354cf688e0bfef0108ad097a6c5bdd4a3c8e736 SHA512 d2a8517fa59da0db146aecc4ed535c57f347d89696d6f5faff14987a992748e706c051ffe9a46b51c4bd9052941e80874f54a41bb261c3c6d6762c3f1b5862c6 WHIRLPOOL c1b4825f0b047605c532b68b9991655325b5253777af02870ecb1982e5be5e445fcc05f724306832c0d533a1f085e3faf6a8828e74abf87da4b12be345a60c2c
-MISC ChangeLog 2289 SHA256 cedb48d94cbd42576c55203309a0c959ad052171ab40067f3dc478f63931290c SHA512 e39dfaabab52a29e7c36a21e2a3fa1b9e50c3cb7ead17a5007e27626a59a071ff5c25ebee5f975c83fb676c88c81982cf1dce9be0b873700d254bb711d63ea9b WHIRLPOOL 3af7772cb4e5f3800254bc7ed9fac4c0887b9cf12eab1932dc550ce4d5d3433a75ab0a7b58b81f8277ea2c737f795a7b7c5e0ab2b22d47031b4f948b792c1441
+MISC ChangeLog 2507 SHA256 29c473fe1d65f3319aed8a2c089d8c0bf3395b6a53292f56f17876e1cc983091 SHA512 6e93e95aa4298600e435eca3c8919c0ad08db6849b2dce5396c46870d4b4a47a5da6a4392b9f74477c14c39fe0f0fb0016b7502b27f8984c289720037749b2b7 WHIRLPOOL 1f441ae5c2621ba7ed5f591240ec2f3fc903954ae4ca3217cea40eeca16019af23c0ad7b56f59ed90f7c9494f99ef5ae065344b8e0fcc534e0c8354086fb9a3d
 MISC metadata.xml 891 SHA256 fd8cff830b610de908d5d60fb0e639498bc67a7bb65bb779127bc3d41fdc14a2 SHA512 bc8dc04bad036aecbb1b83885b03806b6cd17ae55c434b18e72f948ccf0c6bd9ce6b7f80dbe49fd86ff8a46934f97114ef0b49cc352dc9949d0b38ee909d23d5 WHIRLPOOL d89d27afe35561405540752d0d70bdbcfaf9e927adf23663f207716e6de5f30017ed024e2903bb04f5b1d2bb53190085e6efe65a9dc33f6192f318965e495744
diff --git a/app-text/zathura-ps/zathura-ps-0.2.0.ebuild b/app-text/zathura-ps/zathura-ps-0.2.0.ebuild
index 8027373c5dba..5ce22ec89dbd 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.0.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-0.2.0.ebuild,v 1.5 2013/01/11 16:38:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-0.2.0.ebuild,v 1.6 2013/08/14 11:13:10 heroxbd Exp $
 
 EAPI=4
 inherit toolchain-funcs
@@ -24,10 +24,11 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	myzathuraconf=(
+		PREFIX="${EPREFIX}"/usr
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1
-		DESTDIR="${ED}"
+		DESTDIR="${D}"
 		)
 }
 
diff --git a/app-text/zathura-ps/zathura-ps-0.2.1.ebuild b/app-text/zathura-ps/zathura-ps-0.2.1.ebuild
index 8970a3ea8a28..500ae86f59e4 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.1.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-0.2.1.ebuild,v 1.3 2013/08/14 01:58:01 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-0.2.1.ebuild,v 1.4 2013/08/14 11:13:10 heroxbd Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -24,10 +24,11 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	myzathuraconf=(
+		PREFIX="${EPREFIX}"/usr
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1
-		DESTDIR="${ED}"
+		DESTDIR="${D}"
 		)
 }
 
diff --git a/app-text/zathura-ps/zathura-ps-0.2.2.ebuild b/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
index d8d08a66ef65..7a864c0df521 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-0.2.2.ebuild,v 1.3 2013/08/14 01:58:01 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-0.2.2.ebuild,v 1.4 2013/08/14 11:13:10 heroxbd Exp $
 
 EAPI=5
 
@@ -25,11 +25,12 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	#does not render w/o cairo
 	myzathuraconf=(
+		PREFIX="${EPREFIX}"/usr
 		WITH_CAIRO=1
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1
-		DESTDIR="${ED}"
+		DESTDIR="${D}"
 	)
 }