Version bump. Major rewrite to make QA all warm and fuzzi.

(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)

6 files changed, 249 insertions, 1 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index b6e92c012331..d59d892803cd 100644
--- a/sci-electronics/kicad/ChangeLog
+++ b/sci-electronics/kicad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-electronics/kicad
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.63 2013/06/06 18:58:49 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.64 2013/06/06 19:24:31 calchan Exp $
+
+*kicad-20130518 (06 Jun 2013)
+
+  06 Jun 2013; Denis Dupeyron <calchan@gentoo.org> +kicad-20130518.ebuild,
+  +files/kicad-desktop-file.patch, +files/kicad-missing-doc.patch,
+  +files/kicad-native-boost.patch, +files/kicad-scripts.patch:
+  Version bump. Major rewrite to make QA all warm and fuzzi.
 
   06 Jun 2013; Denis Dupeyron <calchan@gentoo.org> kicad-20120119_p3256.ebuild:
   De-keyword kicad-20120119_p3256 to prepare to take kicad out of p.mask.
diff --git a/sci-electronics/kicad/files/kicad-desktop-file.patch b/sci-electronics/kicad/files/kicad-desktop-file.patch
new file mode 100644
index 000000000000..7f982f7fa77f
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-desktop-file.patch
@@ -0,0 +1,35 @@
+From cacd01f36db6277111a35fe60ad4762ee3b002e1 Mon Sep 17 00:00:00 2001
+From: Denis Dupeyron <calchan@gentoo.org>
+Date: Thu, 18 Apr 2013 15:17:36 -0600
+Subject: [PATCH] Fix desktop category and semicolon
+
+---
+ resources/linux/mime/applications/eeschema.desktop | 2 +-
+ resources/linux/mime/applications/kicad.desktop    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/resources/linux/mime/applications/eeschema.desktop b/resources/linux/mime/applications/eeschema.desktop
+index 3042eae..0ed616c 100644
+--- a/resources/linux/mime/applications/eeschema.desktop
++++ b/resources/linux/mime/applications/eeschema.desktop
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Categories=Development;Electronics
++Categories=Electronics;
+ Comment=Design an electronic schematic
+ Comment[fr]=Dessiner des schémas électroniques
+ Exec=eeschema
+diff --git a/resources/linux/mime/applications/kicad.desktop b/resources/linux/mime/applications/kicad.desktop
+index 1d7645b..3a23e34 100644
+--- a/resources/linux/mime/applications/kicad.desktop
++++ b/resources/linux/mime/applications/kicad.desktop
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Categories=Development;Electronics
++Categories=Electronics;
+ Comment=Design a printed circuit board
+ Comment[fr]=Concevoir un circuit imprimé
+ Exec=kicad
+-- 
+1.8.2.1
+
diff --git a/sci-electronics/kicad/files/kicad-missing-doc.patch b/sci-electronics/kicad/files/kicad-missing-doc.patch
new file mode 100644
index 000000000000..3b9f9666e861
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-missing-doc.patch
@@ -0,0 +1,25 @@
+From 096b02e38c5e86902d5403fcb14313be8dd70fb3 Mon Sep 17 00:00:00 2001
+From: Denis Dupeyron <calchan@gentoo.org>
+Date: Thu, 18 Apr 2013 08:11:28 -0600
+Subject: [PATCH] Add missing documentation
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9e6e29a..1069a5f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -415,7 +415,7 @@ add_custom_target(uninstall
+ #================================================
+ # Installation parameters
+ #================================================
+-install(FILES INSTALL.txt
++install(FILES AUTHORS.txt CHANGELOG.txt README.txt
+     DESTINATION ${KICAD_DOCS}
+     COMPONENT resources)
+ 
+-- 
+1.8.2.1
+
diff --git a/sci-electronics/kicad/files/kicad-native-boost.patch b/sci-electronics/kicad/files/kicad-native-boost.patch
new file mode 100644
index 000000000000..595d5f32216b
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-native-boost.patch
@@ -0,0 +1,27 @@
+From 50a62d296e803b75ae46c964173e8b2be0661618 Mon Sep 17 00:00:00 2001
+From: Denis Dupeyron <calchan@gentoo.org>
+Date: Thu, 18 Apr 2013 08:01:43 -0600
+Subject: [PATCH] Use native Boost
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e3c6ae2..9e6e29a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -260,8 +260,8 @@ check_find_package_result(OPENGL_FOUND "OpenGL")
+ # kicad now includes needed boost files.
+ # the two next lines can be uncommented to use the native boost lib.
+ # but this is not a good idea
+-#find_package(Boost 1.36 QUIET)
+-#check_find_package_result(Boost_FOUND "Boost")
++find_package(Boost 1.36 QUIET)
++check_find_package_result(Boost_FOUND "Boost")
+ 
+ ##########################
+ # Find wxWidgets library #
+-- 
+1.8.2.1
+
diff --git a/sci-electronics/kicad/files/kicad-scripts.patch b/sci-electronics/kicad/files/kicad-scripts.patch
new file mode 100644
index 000000000000..9f46157915c7
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-scripts.patch
@@ -0,0 +1,25 @@
+From 065491b83fb7f82606150aa89e70ac99738992e0 Mon Sep 17 00:00:00 2001
+From: Denis Dupeyron <calchan@gentoo.org>
+Date: Wed, 5 Jun 2013 14:03:07 -0600
+Subject: [PATCH] Fix install location of scripts directory
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 59fe7c3..3f3bb14 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -428,7 +428,7 @@ install(FILES resources/freeroute.jnlp
+ ###
+ if(UNIX)
+     install(DIRECTORY scripts
+-            DESTINATION ${KICAD_DOCS}
++            DESTINATION ${KICAD_DATA}
+             COMPONENT resources
+             PATTERN ".svn" EXCLUDE)
+ endif()
+-- 
+1.8.2.1
+
diff --git a/sci-electronics/kicad/kicad-20130518.ebuild b/sci-electronics/kicad/kicad-20130518.ebuild
new file mode 100644
index 000000000000..5d181aa4e9d3
--- /dev/null
+++ b/sci-electronics/kicad/kicad-20130518.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20130518.ebuild,v 1.1 2013/06/06 19:24:31 calchan Exp $
+
+#TODO:
+# - python and wxpython scripting
+
+EAPI="5"
+
+WX_GTK_VER="2.8"
+
+inherit eutils unpacker cmake-utils wxwidgets fdo-mime gnome2-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools."
+HOMEPAGE="http://www.kicad-pcb.org"
+
+RELEASE_DATE="2013-05-18"
+BZR_REV="4017"
+UBUNTU_VER="12.04"
+BASE_SRC_URI="http://iut-tice.ujf-grenoble.fr/cao"
+SRC_URI="${BASE_SRC_URI}/${PN}-sources-stable_${RELEASE_DATE}_BZR${BZR_REV}.zip
+	${BASE_SRC_URI}/${PN}-${RELEASE_DATE}-BZR${BZR_REV}-stable-UBUNTU_${UBUNTU_VER}_full_with_components_doc.tgz"
+
+LICENSE="GPL-2 kicad-doc"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug"
+LANGS="de en es fr hu it ja pl pt ru zh_CN"
+for lang in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${lang}"
+done
+
+CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[gnome,opengl,X]
+	dev-python/wxpython:${WX_GTK_VER}[opengl]"
+DEPEND="${CDEPEND}
+	>=dev-util/cmake-2.6.4
+	>=dev-libs/boost-1.49[python]
+	app-doc/doxygen"
+RDEPEND="${CDEPEND}
+	sys-libs/zlib
+	sci-electronics/electronics-menu"
+
+S="${WORKDIR}/stable_${RELEASE_DATE}_BZR${BZR_REV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-native-boost.patch"
+	epatch "${FILESDIR}/${PN}-desktop-file.patch"
+	epatch "${FILESDIR}/${PN}-scripts.patch"
+	epatch "${FILESDIR}/${PN}-missing-doc.patch"
+	rm -f resources/linux/mime/applications/eeschema.desktop
+}
+
+src_configure() {
+	need-wxwidgets unicode
+
+	mycmakeargs="${mycmakeargs}
+		-DKICAD_STABLE_VERSION=ON
+		-DKICAD_wxUSE_UNICODE=ON
+		-DKICAD_DOCS=/usr/share/doc/${PN}
+		-DKICAD_HELP=/usr/share/doc/${PN}"
+
+#		-DKICAD_SCRIPTING=ON
+#		-DKICAD_SCRIPTING_MODULES=ON
+#		-DKICAD_SCRIPTING_WXPYTHON=ON
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all doxygen-docs
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/${PN}
+	doins -r "${WORKDIR}/${PN}/share/library"
+	doins -r "${WORKDIR}/${PN}/share/modules"
+
+	insinto /usr/share/doc/${PN}
+	doins -r "${WORKDIR}/${PN}/doc/contrib"
+
+	insinto /usr/share/doc/${PN}/help
+	for lang in $LANGS ; do
+		if [[ -d "${WORKDIR}/${PN}/doc/help/${lang}" ]] ; then
+			use linguas_$lang && doins -r "${WORKDIR}/${PN}/doc/help/${lang}"
+		fi
+	done
+
+	insinto /usr/share/doc/${PN}/tutorials
+	for lang in $LANGS ; do
+		if [[ -d "${WORKDIR}/${PN}/doc/tutorials/${lang}" ]] ; then
+			use linguas_$lang && doins -r "${WORKDIR}/${PN}/doc/tutorials/${lang}"
+		fi
+	done
+
+	local dev_doc="/usr/share/doc/${PN}/development"
+	insinto ${dev_doc}
+	doins HOW_TO_CONTRIBUTE.txt notes_about_pcbnew_new_file_format.odt TODO.txt uncrustify.cfg
+	doins "${WORKDIR}/${PN}/doc/help/file_formats/file_formats.pdf"
+	cd Documentation
+	doins -r *
+
+	docompress -x \
+		${dev_doc}/GUI_Translation_HOWTO.odt \
+		${dev_doc}/notes_about_pcbnew_new_file_format.odt \
+		${dev_doc}/uncrustify.cfg
+		${dev_doc}/file_formats.pdf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}