Moved the live ebuild from SVN to BZR (bug #339374, thanks to Karsten Merkle), unified the live ebuild and the last snapshot ebuild, to ease the maintenance.

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

4 files changed, 137 insertions, 41 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index 7001efa3c134..7d36152ba20b 100644
--- a/sci-electronics/kicad/ChangeLog
+++ b/sci-electronics/kicad/ChangeLog
@@ -1,6 +1,12 @@
 # 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.52 2010/12/23 08:46:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.53 2010/12/25 21:37:38 rafaelmartins Exp $
+
+  25 Dec 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
+  kicad-20100505_p2356.ebuild, kicad-99999999.ebuild:
+  Moved the live ebuild from SVN to BZR (bug #339374, thanks to Karsten
+  Merkle), unified the live ebuild and the last snapshot ebuild, to ease the
+  maintenance.
 
   23 Dec 2010; Justin Lecher <jlec@gentoo.org> kicad-20090320.1666-r2.ebuild,
   kicad-20100314_p2456.ebuild, kicad-20100505_p2356.ebuild,
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 9ec4d61e2cb2..6a2f325bb550 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,6 +1,3 @@
------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
@@ -15,14 +12,7 @@ DIST kicad-sources-20100314_p2456.tar.xz 4218420 RMD160 6bf9d81892af0552ba0e0811
 DIST kicad-sources-20100505_p2356.tar.xz 4359004 RMD160 c94694a3377d4db71327bbd9ca5975a8baac5d23 SHA1 fb064d211a3fdb1cf983a6b454f4b7bf3da6e3be SHA256 873acb1b73587cddc2ba666aec12328e8710d745680cb6a74bc13c83c978abd2
 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 3868 RMD160 bd8aa91113d57e1a41e30d0d1a733cb7046ed22c SHA1 75ecafd446f4e76ee015015b6283c3767b3607bd SHA256 50f9c89aa24cdbac34786f2c540f8aeee8df79fc845aa9c849612079efc7a9ad
-EBUILD kicad-99999999.ebuild 3864 RMD160 9e20a5a9fcc0086ca7ea26092f8c6a520f371959 SHA1 2dd4a6257258ebd15f63a63730762af6128d011d SHA256 bbee86caadc88099e6045d7bac17bdd7d2921523ccad588f70f9dc9de3a81690
-MISC ChangeLog 8087 RMD160 bb9a385abc3a006a1fd853971cb57b155f19dfd0 SHA1 c464ff9ac907da126d7d890de01fb2104c19356e SHA256 83007e62aadb6a2687abcdadce5d3342ee5fb831749333096d32a322fd44c814
+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
 MISC metadata.xml 453 RMD160 423fcee9fbe9b007d694450f9c0fa5c16214d9b2 SHA1 802580798f1531bcc97384ca4955a29a4bbd7f4c SHA256 e1eeb975ea33d28547c6f86fafb04dc4925bab409b5a40722df89dc2eb847a1c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0TDI4ACgkQgAnW8HDreRbAoACfTpx2YKouFU9keUEQME3D19O9
-ik8AoKdb6yfwe237r+gCSjBUuL5By0Yb
-=qDsh
------END PGP SIGNATURE-----
diff --git a/sci-electronics/kicad/kicad-20100505_p2356.ebuild b/sci-electronics/kicad/kicad-20100505_p2356.ebuild
index ea6ab6a5027c..f49808501275 100644
--- a/sci-electronics/kicad/kicad-20100505_p2356.ebuild
+++ b/sci-electronics/kicad/kicad-20100505_p2356.ebuild
@@ -1,24 +1,42 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20100505_p2356.ebuild,v 1.2 2010/12/23 08:46:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20100505_p2356.ebuild,v 1.3 2010/12/25 21:37:38 rafaelmartins Exp $
+
+# rafaelmartins: Please try to keep the live ebuild synchronized with
+# the latest snapshot ebuild. e.g.:
+# cp kicad-YYYYMMDD_pXXXX.ebuild kicad-99999999.ebuild
 
 EAPI="3"
 
 WX_GTK_VER="2.8"
 
-inherit cmake-utils wxwidgets fdo-mime gnome2-utils
+BZR_ECLASS=""
+if [[ "${PV}" = "99999999" ]]; then
+	BZR_ECLASS=" bzr"
+fi
+
+inherit cmake-utils wxwidgets fdo-mime gnome2-utils${BZR_ECLASS}
 
 DESCRIPTION="Electronic Schematic and PCB design tools."
 HOMEPAGE="http://kicad.sourceforge.net"
-SRC_URI="
-	http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-sources-${PV}.tar.xz
-	!minimal? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-library-${PV}.tar.xz )
-	doc? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-doc-${PV}.tar.xz )
-	examples? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-examples-${PV}.tar.xz )"
+
+SRC_URI=""
+if [[ "${PV}" != "99999999" ]]; then
+	SRC_URI="
+		http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-sources-${PV}.tar.xz
+		!minimal? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-library-${PV}.tar.xz )
+		doc? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-doc-${PV}.tar.xz )
+		examples? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-examples-${PV}.tar.xz )"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+KEYWORDS=""
+if [[ "${PV}" != "99999999" ]]; then
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
 IUSE="dev-doc debug doc examples minimal python"
 
 CDEPEND="x11-libs/wxGTK:2.8[X,opengl]"
@@ -31,9 +49,42 @@ RDEPEND="${CDEPEND}
 	sys-libs/zlib
 	sci-electronics/electronics-menu"
 
-S="${WORKDIR}/${PN}"
+if [[ "${PV}" != "99999999" ]]; then
+	S="${WORKDIR}/${PN}"
+else
+	src_unpack() {
+		# FIXME: we need to send patches for bzr.eclass, to avoid the weird
+		# declarations of ${P} below.
+		EBZR_REPO_URI="lp:~kicad-testing-committers/kicad/testing" bzr_fetch
+		if ! use minimal; then
+			EBZR_REPO_URI="lp:~kicad-lib-committers/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" \
+				P="${P}/kicad-doc" \
+				EBZR_CACHE_DIR="kicad-doc" bzr_fetch
+		fi
+	}
+fi
 
 src_prepare() {
+
+	# prepare sources from BZR, snapshots are already prepared with this
+	if [[ "${PV}" = "99999999" ]]; then
+		sed -i \
+			-e '/add_subdirectory(template)/ a \
+				add_subdirectory(kicad-doc)\
+				add_subdirectory(kicad-library)' \
+			-e 's/create_svn_version_header()/#create_svn_version_header()/' \
+			-e 's/ -O2 / /' \
+			CMakeLists.txt || die 'sed failed'
+		sed -i \
+			-e 's/Scientific;Development/Engineering;Electronics/' \
+			resources/linux/mime/applications/*.desktop || die 'sed failed'
+	fi
+
 	# Use native boost
 	sed -i -e '/Boost/s/^#check_find_package/check_find_package/' \
 		-e '/Boost/s/^#find_package/find_package/' CMakeLists.txt || die "sed failed"
diff --git a/sci-electronics/kicad/kicad-99999999.ebuild b/sci-electronics/kicad/kicad-99999999.ebuild
index 5d82b5866fe8..9cff4a57ac23 100644
--- a/sci-electronics/kicad/kicad-99999999.ebuild
+++ b/sci-electronics/kicad/kicad-99999999.ebuild
@@ -1,38 +1,89 @@
 # Copyright 1999-2010 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.4 2010/12/23 08:46:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-99999999.ebuild,v 1.5 2010/12/25 21:37:38 rafaelmartins Exp $
+
+# rafaelmartins: Please try to keep the live ebuild synchronized with
+# the latest snapshot ebuild. e.g.:
+# cp kicad-YYYYMMDD_pXXXX.ebuild kicad-99999999.ebuild
+
+EAPI="3"
 
-EAPI="2"
 WX_GTK_VER="2.8"
 
-inherit cmake-utils wxwidgets fdo-mime gnome2-utils subversion
+BZR_ECLASS=""
+if [[ "${PV}" = "99999999" ]]; then
+	BZR_ECLASS=" bzr"
+fi
+
+inherit cmake-utils wxwidgets fdo-mime gnome2-utils${BZR_ECLASS}
 
 DESCRIPTION="Electronic Schematic and PCB design tools."
 HOMEPAGE="http://kicad.sourceforge.net"
 
+SRC_URI=""
+if [[ "${PV}" != "99999999" ]]; then
+	SRC_URI="
+		http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-sources-${PV}.tar.xz
+		!minimal? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-library-${PV}.tar.xz )
+		doc? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-doc-${PV}.tar.xz )
+		examples? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-examples-${PV}.tar.xz )"
+fi
+
 LICENSE="GPL-2"
 SLOT="0"
+
 KEYWORDS=""
-IUSE="dev-doc doc debug examples minimal python"
+if [[ "${PV}" != "99999999" ]]; then
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="dev-doc debug doc examples minimal python"
 
 CDEPEND="x11-libs/wxGTK:2.8[X,opengl]"
 DEPEND="${CDEPEND}
 	>=dev-util/cmake-2.6.0
-	>=dev-libs/boost-1.39[python?]
+	>=dev-libs/boost-1.40[python?]
+	app-arch/xz-utils
 	dev-doc? ( app-doc/doxygen )"
 RDEPEND="${CDEPEND}
 	sys-libs/zlib
 	sci-electronics/electronics-menu"
 
-src_unpack() {
-	local svn_uri_base="https://kicad.svn.sourceforge.net/svnroot/kicad/trunk"
-	subversion_fetch "${svn_uri_base}/kicad"
-	use minimal || subversion_fetch "${svn_uri_base}/kicad-library" kicad-library
-	use doc && subversion_fetch "${svn_uri_base}/kicad-doc" kicad-doc
-}
+if [[ "${PV}" != "99999999" ]]; then
+	S="${WORKDIR}/${PN}"
+else
+	src_unpack() {
+		# FIXME: we need to send patches for bzr.eclass, to avoid the weird
+		# declarations of ${P} below.
+		EBZR_REPO_URI="lp:~kicad-testing-committers/kicad/testing" bzr_fetch
+		if ! use minimal; then
+			EBZR_REPO_URI="lp:~kicad-lib-committers/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" \
+				P="${P}/kicad-doc" \
+				EBZR_CACHE_DIR="kicad-doc" bzr_fetch
+		fi
+	}
+fi
 
 src_prepare() {
-	subversion_src_prepare
+
+	# prepare sources from BZR, snapshots are already prepared with this
+	if [[ "${PV}" = "99999999" ]]; then
+		sed -i \
+			-e '/add_subdirectory(template)/ a \
+				add_subdirectory(kicad-doc)\
+				add_subdirectory(kicad-library)' \
+			-e 's/create_svn_version_header()/#create_svn_version_header()/' \
+			-e 's/ -O2 / /' \
+			CMakeLists.txt || die 'sed failed'
+		sed -i \
+			-e 's/Scientific;Development/Engineering;Electronics/' \
+			resources/linux/mime/applications/*.desktop || die 'sed failed'
+	fi
 
 	# Use native boost
 	sed -i -e '/Boost/s/^#check_find_package/check_find_package/' \
@@ -47,18 +98,16 @@ src_prepare() {
 
 	# Handle optional minimal install
 	if use minimal ; then
-		sed -i -e '/add_subdirectory(template)/d' CMakeLists.txt || die "sed failed"
-	else
-		sed -i -e '/add_subdirectory(template)/a \
-add_subdirectory(kicad-library)' CMakeLists.txt || die "sed failed"
+		sed -i -e '/add_subdirectory(template)/d' \
+			-e '/add_subdirectory(kicad-library)/d' CMakeLists.txt || die "sed failed"
 	fi
 
 	# Add documentation and fix necessary code if requested
 	if use doc ; then
-		sed -i -e '/add_subdirectory(demos)/a \
-add_subdirectory(kicad-doc)' CMakeLists.txt || die "sed failed"
 		sed -i -e "s/subdirs.Add( wxT( \"kicad\" ) );/subdirs.Add( wxT( \"${PF}\" ) );/" \
 			-e '/subdirs.Add( _T( "help" ) );/d' common/edaappl.cpp || die "sed failed"
+	else
+		sed -i -e '/add_subdirectory(kicad-doc)/d' CMakeLists.txt || die "sed failed"
 	fi
 
 	# Install examples in the right place if requested