Fixed bug #267571. Fixed documentation bug. Thanks a lot to Rafael Martins.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 85 insertions, 2 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index 5765aaf1b58d..5a242c63046a 100644
--- a/sci-electronics/kicad/ChangeLog
+++ b/sci-electronics/kicad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/kicad
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.38 2009/04/21 21:53:16 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.39 2009/05/07 15:54:31 calchan Exp $
+
+*kicad-20090320.1666-r1 (07 May 2009)
+
+  07 May 2009; Denis Dupeyron <calchan@gentoo.org>
+  +kicad-20090320.1666-r1.ebuild:
+  Fixed bug #267571. Fixed documentation bug. Thanks a lot to Rafael Martins.
 
   21 Apr 2009; Denis Dupeyron <calchan@gentoo.org> kicad-20090320.1666:
   Fixed bug #266978.
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 0633621eccd6..6bf688029e51 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -5,6 +5,7 @@ DIST kicad-examples-20090320-r1666.tar.lzma 508966 RMD160 3346f0ff9992d22a0641b6
 DIST kicad-library-20090320-r1666.tar.lzma 8597781 RMD160 3f66f5abe2a5ce9988cd480c78cc51899a6ea730 SHA1 f05a95bc2be040baad3e24d4154a82f2e1322074 SHA256 6594415c274d21a2a9953c3cb8ce491c9c12eaadd5ce958a429b61de19c6b21a
 DIST kicad-sources-20090320-r1666.tar.lzma 2654855 RMD160 fb72894f36f022e28efc2ee9eaf02a35ab43b392 SHA1 5e603fd46d0080dfc0ee2d9a1b603367ab45fda0 SHA256 9e59c08d93051f57ec10defd7a6c0afa0feeee9d9a47e2aba82ead9dbeca5ad2
 EBUILD kicad-20070115.ebuild 3528 RMD160 65fc58163cbf1b8e023d408099187ab37b115972 SHA1 da88cbe2656208fa14dae2eec7735b7badf57792 SHA256 95caddf1a0122181afe2375da8444433130299a6c4de007ff223a8c48d83622c
+EBUILD kicad-20090320.1666-r1.ebuild 2506 RMD160 c23e308a8b7aa1d954dd331f5ea12bca1916a4f7 SHA1 b37735b691e79e70c1ca1de9d4e93b4237c060bf SHA256 6028584bd2045107dcf86f337d070023c02b6bc26e23959982572f81baeb05aa
 EBUILD kicad-20090320.1666.ebuild 2305 RMD160 077b989c26e3e342a434874e81aa48402e01c5d6 SHA1 8630f26d414381fa4c012eb582a0d42b570feaf4 SHA256 22e74e1079c6c07bfa98d24f6ba14062abb24503e314150fa94bfa51f92d8cea
-MISC ChangeLog 5910 RMD160 8ef7dd53f1c2b25bb7758eb3798cd1a6eaa922ff SHA1 8e5811f3497531e933d5669c859dd84183c59d50 SHA256 6eb349c3637f6503812cd50de9fdcd0faa1b54d8446e152cf2bafd0a6a347db3
+MISC ChangeLog 6113 RMD160 8574a895a735fcee9d51ad3367aaab406191752f SHA1 c21eef5d3a80c43744fbd902c0c2642f335fe01e SHA256 4c66ebbee877f6476c5a3025a5b77ca39fa7223de0b7f043f5d279ba00d98566
 MISC metadata.xml 339 RMD160 edfadf44bb7c0a6049e40379258ccfbe89b74b5f SHA1 387abeb29f7e875057901f84b2bdb77c4f942c2e SHA256 311ce02a24351429c5d83af4292d0b8fa315ffde140ba06ac64e6bf3c233d173
diff --git a/sci-electronics/kicad/kicad-20090320.1666-r1.ebuild b/sci-electronics/kicad/kicad-20090320.1666-r1.ebuild
new file mode 100644
index 000000000000..e64982238bbf
--- /dev/null
+++ b/sci-electronics/kicad/kicad-20090320.1666-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20090320.1666-r1.ebuild,v 1.1 2009/05/07 15:54:31 calchan Exp $
+
+EAPI="2"
+WX_GTK_VER="2.8"
+
+inherit versionator wxwidgets cmake-utils
+
+MY_PV="$(get_major_version)-r$(get_after_major_version)"
+
+DESCRIPTION="Electronic Schematic and PCB design tools."
+HOMEPAGE="http://kicad.sourceforge.net"
+SRC_URI="http://dev.gentoo.org/~calchan/distfiles/${PN}-sources-${MY_PV}.tar.lzma
+	!minimal? ( http://dev.gentoo.org/~calchan/distfiles/${PN}-library-${MY_PV}.tar.lzma )
+	doc? ( http://dev.gentoo.org/~calchan/distfiles/${PN}-doc-${MY_PV}.tar.lzma )
+	examples? ( http://dev.gentoo.org/~calchan/distfiles/${PN}-examples-${MY_PV}.tar.lzma )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc debug examples minimal python"
+
+CDEPEND=">=dev-util/cmake-2.6.0
+	dev-libs/boost
+	x11-libs/wxGTK:2.8[X,opengl]
+	sys-libs/zlib"
+DEPEND="${CDEPEND}
+	app-arch/lzma-utils"
+RDEPEND="${CDEPEND}
+	python? ( dev-lang/python )"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if use doc ; then
+		# Fix where kicad looks for help files
+		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
+	if ! use examples ; then
+		sed -i -e '/add_subdirectory(demos)/d' CMakeLists.txt || die "sed failed"
+	fi
+	if use minimal ; then
+		sed -i -e '/add_subdirectory(kicad-library)/d' CMakeLists.txt || die "sed failed"
+	fi
+}
+
+src_configure() {
+	need-wxwidgets unicode
+
+	mycmakeargs="${mycmakeargs}
+		-DKICAD_CYRILLIC=ON
+		-DwxUSE_UNICODE=ON
+		$(cmake-utils_use python KICAD_PYTHON)
+		-DKICAD_DOCS=/usr/share/doc/${P}
+		-DKICAD_HELP=/usr/share/doc/${P}"
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if use minimal ; then
+		ewarn "If the schematic and/or board editors complain about missing libraries when you"
+		ewarn "open old projects, you will have to take one or more of the following actions :"
+		ewarn "- Install the missing libraries manually."
+		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
+		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
+		ewarn "- Emerge kicad without the 'minimal' USE flag."
+		elog
+	fi
+	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
+}