Fixed live ebuild. Thanks to Dmitry Olyenyov (bug #358459).

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

3 files changed, 29 insertions, 6 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index 7d36152ba20b..97ba47374e2d 100644
--- a/sci-electronics/kicad/ChangeLog
+++ b/sci-electronics/kicad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/kicad
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.53 2010/12/25 21:37:38 rafaelmartins Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.54 2011/05/24 23:56:20 rafaelmartins Exp $
+
+  24 May 2011; Rafael G. Martins <rafaelmartins@gentoo.org>
+  kicad-99999999.ebuild:
+  Fixed live ebuild. Thanks to Dmitry Olyenyov (bug #358459).
 
   25 Dec 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
   kicad-20100505_p2356.ebuild, kicad-99999999.ebuild:
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 6a2f325bb550..e1f70f6d7d81 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST kicad-doc-20090320-r1666.tar.lzma 24181266 RMD160 ed99c3660e322c1390cf9ffec95a062e4679748a SHA1 e7594a526307410ea1655c9080f45e54f3a80b48 SHA256 fee05afa3437584001680676fa614c6639dc62bee92e140b0c526221d98f2113
 DIST kicad-doc-20100314_p2456.tar.xz 43073972 RMD160 f5bd967d0123ef23fea0be6fba21c88bf33dd0c8 SHA1 13b9ff60846b4191af9f04b78edda8452ffe75be SHA256 1b8a0bf4cee957989c9bd85a2e0fbf5119fac60199d5dcec797b7637eb4bd6ba
 DIST kicad-doc-20100505_p2356.tar.xz 44487272 RMD160 1558d85d370dbbcc686d06a0db57050269bb42cb SHA1 b59b9325a7255bde5dbfaad54838cf4b985c69f3 SHA256 ec3f9e9207d3f50bd78fe2aa9c809d73eb4f3b1e8a802a973d1ac78dff34026c
@@ -13,6 +16,17 @@ DIST kicad-sources-20100505_p2356.tar.xz 4359004 RMD160 c94694a3377d4db71327bbd9
 EBUILD kicad-20090320.1666-r2.ebuild 2484 RMD160 a6cec5cadf8e7c96b569b60df1dd9fa19ef33c09 SHA1 8cfc98055b4d3a6243437a3c70aa26b2fafa4956 SHA256 f0ebe9ec356824476e94c1071ec902e5396a248bfe34b65640cb4d758ff9aa34
 EBUILD kicad-20100314_p2456.ebuild 3937 RMD160 806df3dcb09729832207b955d2aa89a13cf140b2 SHA1 232abdc10a05d99a2181c9af830ab1063880a6e1 SHA256 27309cad451d6e691938718a0375424f28cfe64aa43c62a501e9f2249699adcf
 EBUILD kicad-20100505_p2356.ebuild 5284 RMD160 b07dd82851f61b305cfa3a86e0d78f6e984cd875 SHA1 9a78d780b6a74fd0c5096d93fa8089ec77ca5a56 SHA256 3f959687458f6b32b0e2e51a2e5e9bafe0ab15329a9f2083e20e8899a1ae5f39
-EBUILD kicad-99999999.ebuild 5278 RMD160 02aca97da0b951eb50a1bfc6a089726429f2f4c5 SHA1 6a6612c1a6d57b16a0378d3d4d2c7c4109fac00e SHA256 2683017a620ce0aa6b95bb5b748db1bc51ebf9add060a5f3d0f86a27c93dbc4d
-MISC ChangeLog 8375 RMD160 8cad1a155fed796002ac190c2aefe22cb7712805 SHA1 0f4262819618de2d9300a26e59047f9940aef8b1 SHA256 43ba7a36a4f3f7014931c888112ecbdc1ced1b9aa60ba60d7f12947a420c5250
+EBUILD kicad-99999999.ebuild 5436 RMD160 1b18089bed1a19546dcc36319fbd130e1cb48b9d SHA1 767cc9acb0ac7b62ec1b93b1152a751977e24166 SHA256 30477334fb64a0de4563ea5ee67cc9ccb456451894640d838eb4fe7c3e7a3659
+MISC ChangeLog 8523 RMD160 496891d28d7a1b44bcf1acffc7446cebb03339f9 SHA1 cd893f7effd93a677cb308c8077047b81ffa8685 SHA256 e3571bf0917e74cea4ad1232da68da931ddc3adc0005b6e25915a1663e6e2dea
 MISC metadata.xml 453 RMD160 423fcee9fbe9b007d694450f9c0fa5c16214d9b2 SHA1 802580798f1531bcc97384ca4955a29a4bbd7f4c SHA256 e1eeb975ea33d28547c6f86fafb04dc4925bab409b5a40722df89dc2eb847a1c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJN3EWuAAoJEMmH5mwCk1NvBCsH/1htPgy/bHlFZ3d0keKbifYB
+swHGA+wiwhMbIH/5bscScUq7Dc3b4qqbbHWA0umh/BdEXKKtzsFRNmKpu+BTyMS7
+lJ10Dvx5euewiN2q8bPzp6Y09O76B66hG0WpFBF9Q0aP333rrfWlSKKwL0bKWpgI
+9R3y6qTYkJJpV4hH+7QEgM5meRrKuzWuWviBQ4ynr8HWx0E2QtU9HWz14Ho7vHyC
+mExcFwBP5gKtui7VdwLi1ThxDc8lG4QsE8MheA1rk3o5IFAdG4asillnK2It4ZCz
+6SxFu3ksrL55um/tkq0JWsdNKlYc4/LZ0/clPitXOlXFv4v1GSTXI8R/Tux9asM=
+=OV7D
+-----END PGP SIGNATURE-----
diff --git a/sci-electronics/kicad/kicad-99999999.ebuild b/sci-electronics/kicad/kicad-99999999.ebuild
index 9cff4a57ac23..1a3d654c923f 100644
--- a/sci-electronics/kicad/kicad-99999999.ebuild
+++ b/sci-electronics/kicad/kicad-99999999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-99999999.ebuild,v 1.5 2010/12/25 21:37:38 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-99999999.ebuild,v 1.6 2011/05/24 23:56:20 rafaelmartins Exp $
 
 # rafaelmartins: Please try to keep the live ebuild synchronized with
 # the latest snapshot ebuild. e.g.:
@@ -58,11 +58,13 @@ else
 		EBZR_REPO_URI="lp:~kicad-testing-committers/kicad/testing" bzr_fetch
 		if ! use minimal; then
 			EBZR_REPO_URI="lp:~kicad-lib-committers/kicad/library" \
+				EBZR_PROJECT="kicad-library" \
 				P="${P}/kicad-library" \
 				EBZR_CACHE_DIR="kicad-library" bzr_fetch
 		fi
 		if use doc; then
 			EBZR_REPO_URI="lp:~kicad-developers/kicad/doc" \
+				EBZR_PROJECT="kicad-doc" \
 				P="${P}/kicad-doc" \
 				EBZR_CACHE_DIR="kicad-doc" bzr_fetch
 		fi
@@ -132,6 +134,9 @@ src_configure() {
 		-DKICAD_HELP=/usr/share/doc/${PF}
 		$(cmake-utils_use python KICAD_PYTHON)"
 
+	[[ "${PV}" = "99999999" ]] && \
+		mycmakeargs="${mycmakeargs} -DKICAD_TESTING_VERSION=ON"
+
 	cmake-utils_src_configure
 }