Fixed bug #292005, thanks to Rafael Martins.

Package-Manager: portage-2.1.7.1/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 13 insertions, 89 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index 84ef8134fc12..3cf5bfe9fb74 100644
--- a/sci-electronics/kicad/ChangeLog
+++ b/sci-electronics/kicad/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2009/10/07 20:47:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.42 2009/11/06 16:51:03 calchan Exp $
+
+*kicad-20090320.1666-r2 (06 Nov 2009)
+
+  06 Nov 2009; Denis Dupeyron <calchan@gentoo.org>
+  -kicad-20090320.1666.ebuild, -kicad-20090320.1666-r1.ebuild,
+  +kicad-20090320.1666-r2.ebuild:
+  Fixed bug #292005, thanks to Rafael Martins.
 
   07 Oct 2009; Markus Meier <maekke@gentoo.org>
   kicad-20090320.1666-r1.ebuild:
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index df7cf63ad68f..7c8e60e48bb1 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kicad-2007-01-15.tgz 61333975 RMD160 122313a847ab78bc8e7c796956b7df84e8c789d7 SHA1 347324baf943efb8ea6c21a709fefa1119aa0119 SHA256 10a2ada595dd84d54fbe013f3230894999996660916698eae78773fd168b4ba1
 DIST kicad-20070115.tar.bz2 11653448 RMD160 3ca516324aabb8fd7b6038fba34603298bf612de SHA1 21d2e865c064173d8b346386b4ba7c9800fd383d SHA256 0c9cfb0241714207498a71122570e453389d977ad33942bac68cec154cfbed35
 DIST kicad-doc-20090320-r1666.tar.lzma 24181266 RMD160 ed99c3660e322c1390cf9ffec95a062e4679748a SHA1 e7594a526307410ea1655c9080f45e54f3a80b48 SHA256 fee05afa3437584001680676fa614c6639dc62bee92e140b0c526221d98f2113
@@ -8,14 +5,6 @@ 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 2528 RMD160 d45f53801c271c772fa1bcacbbcdc0ceb2b58793 SHA1 c551ed069d122c52c8c2976f03a563cb389ae439 SHA256 e40683e92f4fd23516bdf4a93cfa3a4623b46fe5d8de11e43a2ae4b065a9e609
-EBUILD kicad-20090320.1666.ebuild 2332 RMD160 b0bb01de2235f13daf82288b558fcc657e0bc18c SHA1 35a4197d4206ee11ebc6f2a7dcb53b0280e1583c SHA256 65fbad327feeb07a836dede82d89e7f00cde598645dea26942edb0faa271695c
-MISC ChangeLog 6378 RMD160 138ed7627f260695412ec7c20a27d08f36fd5f94 SHA1 72b9ce646d36ac1064c3b862a6f02e195fd0b9d6 SHA256 bda164e6e126a00bb7b7b92323bf6afa17e66ac9891e0c768d5c40337285384a
+EBUILD kicad-20090320.1666-r2.ebuild 2531 RMD160 7be174839d1c9d7f036de357b10b0be2b49861a5 SHA1 fe3bfbfb8c88c5c6f33c262512ea6514f6ce3401 SHA256 c784addfed5c6b441b44ff99691c05ef2dfc3f8b0c9ce7bedda203698c74537d
+MISC ChangeLog 6614 RMD160 d3711a87a6419ff41c4bc84399a478a7674bd1d9 SHA1 38ed94d6dbc75434a702043719af1c38fcc52457 SHA256 ed140f2dcac5a04c420421d3e4827852277cc7526c6da1adf8261b625ffc8419
 MISC metadata.xml 339 RMD160 edfadf44bb7c0a6049e40379258ccfbe89b74b5f SHA1 387abeb29f7e875057901f84b2bdb77c4f942c2e SHA256 311ce02a24351429c5d83af4292d0b8fa315ffde140ba06ac64e6bf3c233d173
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrM/pcACgkQkKaRLQcq0GKL6wCgpMPpWe8Z7jWBKHvBRyHau/hK
-9q0An2xmzbYEHWMO6yvyh7kzykt8yauu
-=OpFS
------END PGP SIGNATURE-----
diff --git a/sci-electronics/kicad/kicad-20090320.1666-r1.ebuild b/sci-electronics/kicad/kicad-20090320.1666-r2.ebuild
index 0b643a8bb3d2..ef9a53f44a3d 100644
--- a/sci-electronics/kicad/kicad-20090320.1666-r1.ebuild
+++ b/sci-electronics/kicad/kicad-20090320.1666-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2009/10/07 20:47:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20090320.1666-r2.ebuild,v 1.1 2009/11/06 16:51:03 calchan Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
@@ -56,8 +56,8 @@ src_configure() {
 		-DKICAD_CYRILLIC=ON
 		-DwxUSE_UNICODE=ON
 		$(cmake-utils_use python KICAD_PYTHON)
-		-DKICAD_DOCS=/usr/share/doc/${P}
-		-DKICAD_HELP=/usr/share/doc/${P}"
+		-DKICAD_DOCS=/usr/share/doc/${PF}
+		-DKICAD_HELP=/usr/share/doc/${PF}"
 
 	cmake-utils_src_configure
 }
diff --git a/sci-electronics/kicad/kicad-20090320.1666.ebuild b/sci-electronics/kicad/kicad-20090320.1666.ebuild
deleted file mode 100644
index cc6bf26a3a3e..000000000000
--- a/sci-electronics/kicad/kicad-20090320.1666.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.ebuild,v 1.3 2009/09/10 15:35:52 ssuominen 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/xz-utils app-arch/lzma-utils )"
-RDEPEND="${CDEPEND}
-	python? ( dev-lang/python )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if ! use doc ; then
-		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
-		-DKICAD_GOST=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."
-	fi
-	elog
-	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
-}