Combine live ebuild and latest release.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 38 insertions, 24 deletions

diff --git a/app-misc/ranger/ChangeLog b/app-misc/ranger/ChangeLog
index 0c0a2072044a..0acb52f20c46 100644
--- a/app-misc/ranger/ChangeLog
+++ b/app-misc/ranger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/ranger
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ChangeLog,v 1.23 2013/03/02 06:36:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ChangeLog,v 1.24 2013/03/02 06:41:49 radhermit Exp $
+
+  02 Mar 2013; Tim Harder <radhermit@gentoo.org> ranger-1.6.0.ebuild,
+  ranger-9999.ebuild:
+  Combine live ebuild and latest release.
 
 *ranger-1.6.0 (02 Mar 2013)
 
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index cec313c88bb9..e2b769d34ce7 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -7,18 +7,18 @@ DIST ranger-1.6.0.tar.gz 154775 SHA256 65eaef4710b15133298b363a38277d8319d532784
 EBUILD ranger-1.5.4.ebuild 760 SHA256 e1aa7bb84dfea6a6f67f00b8ca1ae35e87d3867f2f5e55303862b1e574dec10a SHA512 34e945cc851e0e8f2c38142c34a526bf21a49feb7ae49a97fad6338bb5b7e9f1518615c5975f420ef8fd828b60ff6a0ee7af922720fda7379b9372cdff39c97a WHIRLPOOL 2f86016d4b1bb2060eaba63183fede92601b1bf04fc4ceb7ac678085700a9ccdccc614600f0e461983cf531827a61a3c610c49a38bdad3cd96f75f34ed2d7598
 EBUILD ranger-1.5.5-r1.ebuild 704 SHA256 7e5b1c46a7bc3a9fb600712abb66fa95352c8811eb1ec5e1afa6e182f578d184 SHA512 a7ba2e1c60f920ce00b2c1987bc06c3706e0e70264816d4e37cb6c4055739dec99823255b2741391c9b7ff8b59800d0057048025eed256fa4b515c152bb19a6a WHIRLPOOL 11dc9aeb41008f72f48ac932c9873ebaf69c55539a2f1e27b8a2753e0244239926dada41c7162837799c70c6ed567f56d06c2531fdc16e3233aa6a7f845ff6c6
 EBUILD ranger-1.5.5.ebuild 760 SHA256 26bda8aedc5ee17e647df28ce621ba177bf82672f260415510488fb21ff5416b SHA512 02aa91c1d878b2fdc9e6995c315785e41fe074788e0d62ae0512bb7465dfea80dec9aa6d569fa824972cbd92d9b488a18c73c7c989a8302fb76f343145a4418f WHIRLPOOL b4ce7931d00e698eb995fa024509ae8f269d4caa684030b11f2d7f884ce9017e2bfb15bf4e0d3b05c97a6703bcbfc12614b9ef76ea5e6709bf35e5a7cb29f36a
-EBUILD ranger-1.6.0.ebuild 740 SHA256 9eff3f3a8f54f0a5d9db3a252168ac5e23c1ec898930ddb0c297a9b28c6faa4c SHA512 530133c5524233525231dfde0bcce85bfffd4f2009ab4d091d5a60677263f67d94e716220af1ba36ae9ea70208c7212227167f38f1e57a0a3ef0429c2c759f22 WHIRLPOOL e6573ed8f9cc889f2cdfb8e05c4472c79afc5783f75f1347d77c92dc71dbdf8f56c6dbcceec62cc01e638422d50fe00c4250465e8597a261e5ce1fa4123261df
-EBUILD ranger-9999.ebuild 707 SHA256 8760d75e706cbb7b2f6c6f94afb3b4f2e7f37e9a69864942ae03dfd58062d832 SHA512 f2365c9ca5384d7d1e3e7304fc08881672f8943d37f899ba7f8e2fe2faf79d6ca7c218bda3e1b3751f27e1f9f7c2e77a93f55ce1e0cca679cd6d86857f6e5458 WHIRLPOOL 01ba063612aab625b95e58e280b80946e0a26c5a0662cb852d3fe75fa4f11b0de950e7ac936ba6bc990ee3ee10545a5678d2e68bccfa739aa0b3bb94fda64f1a
-MISC ChangeLog 3132 SHA256 3357496e984469d773a463a246d6edc9c0b985d21d9b0a396808196ce76fc4b5 SHA512 71c9929a75c5619e2073a12b3ef57e4d9fd32c129f099c533d8c3bcd08c4ce3ea9d973f0a070b95407a127f08a0e4ac39db50dbd73e78e238e3dd70dbbb5b59c WHIRLPOOL 568aa6ad8c6ccd3ba514c7a9bc549e241f3f309e1207df3b0ef6288a5793479f80939b075542606c65436a4289cb80b7b96c4eb2be0266474f74771a4d0b270b
+EBUILD ranger-1.6.0.ebuild 855 SHA256 e7b3c440aeac5a4e3dc9927a7545fb077922cc7cfe7e24dd42f06230c6727d2f SHA512 070b04c2859ddf7b1b4cce909e80fb0fca1dcfa790369d38ecd0c01df26bad107aee9e80df3cdd76b529704d55261c01b8f17f0df0edbbf2232505fab0105b91 WHIRLPOOL 790728f196fa87b25ee817deb91e6befb09034de33e0724a0b39451fc4040f594ac8f9af3cb410a5a0ce9b18f09625950ad45469f44489e96434453413745413
+EBUILD ranger-9999.ebuild 854 SHA256 278ac3254363d04c0458e7e850beeb44135f4f107205d0fa928cd81f4a45f8a3 SHA512 4e542711f533dd31b2cede6f0c09560e34c8e9234f0d55c601139adb83a337be9aaa46b8ff82fceb2c22255b2ab77f50a7b646578effbbdc8dbe41eed906a60f WHIRLPOOL 0756ec841b8361dbc81346fa442ba98a154875194e1b4af9f01906eb1bbe89278fbc8ab88950fe49d390cd2e9c2a7df4399fbee1c5c16883cf9f4227202aa3ab
+MISC ChangeLog 3267 SHA256 389c724533b65f6c1d9f813c28060fcad16719a9290d78526b27f692195f7624 SHA512 f11425de63a39a43c5ef89f1bf8f1add83796d7bf02b8a92621de32fb903e650e7e6c5eac14c6c88af6d3e8934f192037b3d84fb7a3184cac8670a746fbb1dc6 WHIRLPOOL b8270f37911e6101e88ef7f130874ffe20e91e64ef9746df1cce75192001c2b934b200a4f5d1d0ceba20df5f3ad84685e3e0c8850f34df2442daf6fb1a9db561
 MISC metadata.xml 606 SHA256 23bf71ec9bd274559017c3e47627f7653d2a51ca61f4b736caf12183eb2cf6e7 SHA512 a1d59fe4417ac2dbadf2ba4d33bca4a71e31b4073602491fdcaceb2004d76c27a1e689e7dc4fc72e723db8ce1d0034ba4859c42f6fe2e54ed1e15789814cba35 WHIRLPOOL f9e5ec2465956ccd48b067a334a121544ebd1744f8a965be5ba14c6aa5d0d7a643cca20d5034b582fa5935c56091d65e86ab05cd4a7deda0eb30cb9ebd472c28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRMZ33AAoJEEqz6FtPBkyj10EIAKQJ2Y7gjRvp6JxOYTfQbT/U
-Q9b6/LmIlujT6nYMoNtVG2waigljjehOUep/mVIlFyLQ1U1udkxZPAgw9nxgPLOn
-vc8GCfXI0A+yeLPwcQiG09vSBPf2kIH3UNPao03Jj4zXhjv725bj/xPNW1xmJp5Y
-aDiPB/EpbdyO8s3Jehx1Bb9u4+D1bRgj8KNk5jBbxiudXSGlpGR/yE+FhrVpsrqB
-sbh803QYRh2tMOduxy9+/cW8WHzlQnihoxA33OFQ28gI2g0xrxvDZP8kAA5M5DvG
-s92sb0mxi3Bw6vVCbluNuEbBo3i+wiOorXx5IBkNCu/Rx1ThGBgByKA80wXfInk=
-=bSEC
+iQEcBAEBCAAGBQJRMZ8uAAoJEEqz6FtPBkyjZ30IAKW2AQxHiUPnE5J0Sfef6+66
+Gw6NscB0j957EZcDz+8V3qeoc/2atIcf+JfnsaNmhkAwinI6Bbs0HYsyn90jo4P5
+4U+ra/Q0sAntIVEzdwX6mlYANobk6i/W4NedhvtdmGuqhv/i0FTfGDQcRHsTrl1M
+HzO93DHqfJV3g+TlIRBa6gJjz9nR7RfJ6jIVWRzBf/HeFjSBAnQzJwwNc02xEte2
+TGJ1xqsPYGkuflPEs5A3/y/hBubgnQDRQbrAMXx4JV4muEer69ZXIjjSRJJAfTSt
+dAhqt0IDkH9G94nNb4lqRV7yTqPTh/IrncVqucyfYhRpKDcG286pLo0eXzo3/4I=
+=ZfJH
 -----END PGP SIGNATURE-----
diff --git a/app-misc/ranger/ranger-1.6.0.ebuild b/app-misc/ranger/ranger-1.6.0.ebuild
index 30d7d5a850e6..e2c24d9da62b 100644
--- a/app-misc/ranger/ranger-1.6.0.ebuild
+++ b/app-misc/ranger/ranger-1.6.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-misc/ranger/ranger-1.6.0.ebuild,v 1.1 2013/03/02 06:36:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.6.0.ebuild,v 1.2 2013/03/02 06:41:49 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
@@ -8,13 +8,18 @@ PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
 
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/ranger.git"
+	inherit git-2
+else
+	SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 DESCRIPTION="A vim-inspired file manager for the console"
 HOMEPAGE="http://ranger.nongnu.org/"
-SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz"
-
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 RDEPEND="virtual/pager"
 
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index 16d8225c231a..345261546a35 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -1,26 +1,31 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-9999.ebuild,v 1.3 2013/01/11 22:25:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-9999.ebuild,v 1.4 2013/03/02 06:41:49 radhermit Exp $
 
-EAPI="5"
+EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
 PYTHON_REQ_USE="ncurses"
 
-inherit distutils-r1 git-2
+inherit distutils-r1
 
-EGIT_REPO_URI="git://git.savannah.nongnu.org/ranger.git"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/ranger.git"
+	inherit git-2
+else
+	SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="A vim-inspired file manager for the console"
 HOMEPAGE="http://ranger.nongnu.org/"
-
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
 RDEPEND="virtual/pager"
 
 pkg_postinst() {
-	elog "Ranger has many optional dependencies to support enhanced file previews."
-	elog "See the README or homepage for more details."
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "Ranger has many optional dependencies to support enhanced file previews."
+		elog "See the README or homepage for more details."
+	fi
 }