Fixed bug #292005, thanks to Rafael Martins.

(Portage version: 2.1.7.1/cvs/Linux i686, RepoMan options: --force)

3 files changed, 11 insertions, 76 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/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."
-}