Restore combined live/non-live ebuild logic #553754 by Tiger.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 31 insertions, 19 deletions

diff --git a/dev-embedded/sdcc/ChangeLog b/dev-embedded/sdcc/ChangeLog
index d8c507abef2c..8526b9b923b1 100644
--- a/dev-embedded/sdcc/ChangeLog
+++ b/dev-embedded/sdcc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-embedded/sdcc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.51 2015/07/13 07:44:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.52 2015/07/13 07:46:57 vapier Exp $
+
+  13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild:
+  Restore combined live/non-live ebuild logic #553754 by Tiger.
 
   13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild:
   Drop redundant --prefix and fix --docdir definition #553754 by Tiger.
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 22b5d6e53ffb..9d8676caa0d0 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -23,24 +23,24 @@ EBUILD sdcc-2.6.0.ebuild 1575 SHA256 f25810c3129b36ff265da9e857e27d49a542a9fa5e0
 EBUILD sdcc-2.7.0.ebuild 1577 SHA256 b5bd996bd02e31e297e366a000babd5f56ba8fd3ee046d721f6af3fc0ec114de SHA512 6f33044f78499df541374ec8ef3ad2a80d61bf302c84e5d02cdab5d868d09be7027ea5e89b7b5c79aff9dfb00cd3cc547093fd7a82c877e2f457ae16c4fcdff0 WHIRLPOOL 0eae202fa9e91c128b373440442b3696c0475910e63b0f4e3e6fb6c6475aab041ba0aab33f2df9b63b504cdf64a67c7d7488a2a656594319363d0d0a74893c4a
 EBUILD sdcc-2.8.0.ebuild 2087 SHA256 400e3c7ec3b0325549033435b8d320a1677e118f7fc92c0e458bf2f63057788e SHA512 eb999c838d372eee0e9d62a9a48b9f6caf133aa2aa4c8a5aca5e8f229b4e50d80a1c77a8328e700b4f980321b24a90a690b0e991d5c5d5fc33e2cb1de3f2aa4f WHIRLPOOL e9fd0b3121ac1fde0769edae008e4beab2e45d805fe330e4458d323fe5f39edf499b6cc3037b3270e0072576d4e7e06ddb3b348c5b4efe1cb621498048040f72
 EBUILD sdcc-2.9.0.ebuild 2396 SHA256 326504d5b4f77aa03bdd100a811f6fdc0c9fc054b2794c09367a33a19f7b2c4a SHA512 ad39aa59b2138db840c5f83c3d4c5dba593ee36b1fb477082b5e3e2e1b7f1bc3648c859166b2cd76c110ab46e8967247ea48a108aa6ef70d5ae07366ecd69ef6 WHIRLPOOL ae49d98ec4de563aa48620bd61941d10faf4a60b140a6f5717d5955b80ce974284ed5734b3aa0e253dcff84181905446c070792fab26548ee1cc0cc4bf875dce
-EBUILD sdcc-3.5.0.ebuild 2495 SHA256 49d067d9693fe164d00e6e1d7ee3c27c2faffaf147618be3f57f716b9841b2b5 SHA512 731ab467908caa2b907d78b4df95866166974bc53b27c2bc92477aeff04a06fd66c6c1f712a9fe60a5f3fe19ce08daf38c5047a55be2209a66c050e4c0660192 WHIRLPOOL 1b30434c1525f35005622960c67c728bdd3b3ab62195c1599c05711868e98cf69ca74a8b3c179265a93d5b25dbd3ff0277cfddd3376e0d14dec96dedb4726edf
+EBUILD sdcc-3.5.0.ebuild 2746 SHA256 defbd8fb0f0b5fd87c4191b4953c732b31c93856a8bdf91e7afcdabb4bc1685b SHA512 0fc35fa64baa8d447eae5c5670546f58b89948412ffd5baf1c07ce4f28e51b9b498d133e0935fa11f3cb160fdeb41a9a966b2d139995a964c6f2c44d98834374 WHIRLPOOL e2e73bb1c5b27d9f3ba9bb6566cac09356713792896bd9c2ccdaf429f1eb365a500eed8af8b268011228b77bfa81045c4da1f821d21ae6e1d58b33bf077e79cc
 EBUILD sdcc-9999.ebuild 2099 SHA256 d038bbdb9ecac81c9c3c8a9d419054837a8e8e8698c032e08ea5aaa141ec02ed SHA512 624e0061af48f64e44f755119c8171ea584941e1dcb35e019fed98ef534512944f39b150a2644fa8f521190a1041c1d9f7fbcaf0c90d8bf393273f7ee13e7cd3 WHIRLPOOL 6743e3168c5f5796e8382799f414d954fd2681980cb10ad3fb2c5b8b4d06a03db5b5f1fd58b58141abab3b186d73ea693e46cd0f69f8d2f8b73d544894bc2db1
-MISC ChangeLog 8258 SHA256 4dc6fe7267efc64d624a406cff26e443eef39a2f1c9d115ebcc508cca52f1501 SHA512 ca812de5aeb620c898dbe671eadbaa75897de13d0235e4d8679a2f858ce00d1d2bc739c93190bf4e0603144a851a8cc289f53b67b4a6222f0fc3990eb1b4caaf WHIRLPOOL 4c2d877120f07e31bfdf18414e2f062737212983654fa4e506fc49d9c58a30bfb76c3701490b324ab2ae1c3d9dbaffb6cca61a3bf55f9a0043ad365b07edbeb7
+MISC ChangeLog 8392 SHA256 c47be3145e1f80d19c608be426f07460a10573e3a26f0827391eb243f27442d2 SHA512 634b43054ee293977a80bdbad123bd4ca7dc8fc5400b10fa061819452a2a7257c072ab0e135654c9aba714f831a9599e2e8feb6485c7c644a4ee4c9a05e78202 WHIRLPOOL ed3c0919cc64b823b368b628b8d4fa01d5f8d2017bb2dcc5f82844133ba842c938aa1d66b7090fc90f316be06951c25d9849fb089d3f50a06735e2657c9b6f28
 MISC metadata.xml 2127 SHA256 feb21b4a44a0d8a54618276763cbfcb418067ae5102f0b8d2575731aff986bde SHA512 71c4eb72abe7a582ce785df9e542e2c83ac1fa9e45a20d0258cea3d625552291032adf0d84287e6f570b3e6f04f6e632d3481665711a603b9a14ae3368ac27e2 WHIRLPOOL a3b74adab58f7c935611033b27d9a2544270219f9ee5592ed4dfd9630c322e6f42369f6d29e413563246d63e0d55f8b069a4092daa00a7061825e1574791ea43
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVo2xIAAoJEPGu1DbS6WIA7h8P/0KOSfdwDOyuzleI3W6wUXMT
-OanVa/XGh+/6kHmuDpDDwOiXTwRR8E1Sc4z5bXXr5qINoCkC4dI5OythFu5MnnKN
-O+zwHgGLvQbvnBxym058DxTx2HC2Rs2C3YLE/thS5fXy4NSA9Tg8J8qakOBCtscc
-CjI/rbkUDUw4Hq5MIb5SIcaeQLfKFF2Hh9m9ztMWBfq7DYwZ3xstpkzwmz9EWQu+
-U38nfDkMM6V3+rruK4lWv/FSaZVQRvEbPHJKbF2v37RqAhP/0m4M1iHI2rn3jYhb
-T/kPUZpcEGhg88bbZ/0QENVmzGlyldUqbbgEsnxOzLOWzhiYNyNlC/Kqfz+mOYMN
-UB4N78nLvlwwwHsT783emOnYLV8WwCwYIYJa1Bg3cFHd+HNhfSIWbwjs9fQuN7cU
-UudsVqLDrMMg93wb+9eIatY5B3/XRUU6vYqG8ieWfNtFWoSx5MiNB4Uwqt1z97G4
-0JxDt1LAyMKb2pKUalSf2Z9swTm8TXAlSZJp/g4SV9WfBNHLP9TYk/CiURQF05SV
-C9onSWXkntP7gdAuRWMv2m4RXZMbeybDvxHr4r65lrXU62J5NUmcgd2ve2Zbb65A
-0lHHwAzZD4/3vpiYOXFnEolFdq2A/7HBvIbtV4E6coBfMTaFxCRik2/cMdVoat/s
-+Yf8D+vn4YB8NrwoSoCa
-=Cjq2
+iQIcBAEBCAAGBQJVo2zyAAoJEPGu1DbS6WIAvYYP/jE7kWWlMv8qbJLIKLYBL9Eh
+SnqCCiZIgk52+2NJSlwJVxUSQHHz9O/83YpI240nlGM3My0e7iE3qZ+d68sFNIk8
+lz/Itqixd8YNgoEEVH+/jfEJdXps3eHR4C8kUfZ3DQX6rBVMaWM5KRGDNYtqEN4s
+CEYWQCOdmALs1p5p0gJM1A4gWYZzSU3wD301dBo4WUF0rDfLQioT4oerPt2Ecn9L
+aQ3HsIUgpBxkYFKZAhyPtYmfEMgTFmjzy0O64RVBbkGgCe9Vu24dnZPgx3qMJuW+
+E+YJdI3d+YiGiwmLwS5VTU/bxeJHSHs4tAyj034YaX8lvwtB2dblXxDBkd/dB2lL
+Q4z+5aDp+SfBxLigbXnKHWyDCFbA26Ho8EfOE4IB+JBVypsilQUv+p7sYsLhakpM
+otK0PPgYwPs2VdLMojfBHRZUZhqpujCG4ZbF+2M0tHISL82yJozu+NjE23NRuZo5
+jpKfQD5Z8yAtMTSTmQlNUCCxQndJdzPyjV3V9WpVjdUYhMYLc1QixyIGlBPR/j6H
+dPZiUjCJL/doHuqwBWr/uyGgUnlqfp4rchxh6/ebo7Fxbfyupyh0aYrlXgi1E0X4
+qZzQYOAAZxFKnDKznSNm9RBNbsjAi9xkt5BXVu2x7LujbGkq3dtCz8geaOF/YjWd
+JUZxrtAc0UVbz2HJA0aX
+=TaZB
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
index 312135ef1465..f15248eeb820 100644
--- a/dev-embedded/sdcc/sdcc-3.5.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
@@ -1,12 +1,19 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.3 2015/07/13 07:44:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.4 2015/07/13 07:46:57 vapier Exp $
 
 EAPI="5"
 
 inherit eutils
 
-SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2"
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc"
+	inherit subversion
+else
+	SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
 DESCRIPTION="Small device C compiler (for various microprocessors)"
 HOMEPAGE="http://sdcc.sourceforge.net/"
 
@@ -14,7 +21,6 @@ LICENSE="GPL-2 ZLIB
 	non-free? ( MicroChip-SDCC )
 	packihx? ( public-domain )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
 ucsim device-lib packihx +sdcpp sdcdb sdbinutils non-free +boehm-gc"
 
@@ -44,6 +50,9 @@ src_prepare() {
 		-exec sed -r -i \
 		-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
 		{} + || die
+
+	# Make sure timestamps don't get messed up.
+	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
 }
 
 src_configure() {