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

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64

7 files changed, 257 insertions, 2 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/Manifest b/sci-electronics/kicad/Manifest
index 19357dcca0b5..cde14970514e 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,4 +1,11 @@
+AUX kicad-desktop-file.patch 1288 SHA256 f95a2cdac3a53658583b624471953f3462b13fb038999db3a449ce52109d29dc SHA512 05910b935f6f45e753ea182a30a91eeca8f0042ba2cdf80abc62d0d87a30be0ed7a2304efeac8c95aa1e42c8541e22d13723d70489465cf836bc115d758e8fc8 WHIRLPOOL 2782473ed3af45c5d38f7bc1fbd15292ec6792326f6e3c597b3778c7ffbcd721c09cb036c7cfed3a3f86632a4291fb8765b0b9d764ac591db71ec3c74a6b74ed
+AUX kicad-missing-doc.patch 715 SHA256 7db770941dcf89ae4ab1605ba44f4057c407008dee9c4fd9fc1eb50852174656 SHA512 b371003e0f58ff0436e9f214de396310b57561d6decbe2aa793e703e5e923fc1fdc3fc444f8bc8d3a35968b1b66f5984e122986cd116fd958056446ecf62d0e5 WHIRLPOOL 151e631c12f4a9d2441ae99ed7a04d1a737f61d8083b0ce3640706f839fe0b719e63ab532cab28ccd5689f3c45b77df6496b51112d45922c768f8abb67f4f4f7
+AUX kicad-native-boost.patch 827 SHA256 bdd068fa6445468462d3abd58e386b946309d86689e934c852258993114b7c5a SHA512 69332ced14444e48184842ad1393878d77879466e10cc51440700fbc84db33d1c9cd67bc196aebbd4fcdc8dba14a9fbe68d592a27311fc6485256abb67fb48b6 WHIRLPOOL 4d6fec2d96256eb8d87bc3211ff864c556d912ea9f1185d6d5e6f43517f057eec7bed0f2ca897f83d94bd3b27c0c62e3c8cc9180ded5cb49a10ac3921ca98ce2
+AUX kicad-scripts.patch 677 SHA256 eb354b1c24171c6a53d009e344d0236111b49804ef632b3654ddb3d7a0ffbd9f SHA512 cab0bc7cce0bf23a6f53627bdb461747d30d2c362fb2dc57a4a3e4edca993aaff1cce9403a2a0c6f76425750dd064b3914d0fbeb917fc8429ee2fa821dd0ff19 WHIRLPOOL 54477e895b71cfbb8b41a498d5d479d5c024a1235d90631aee22f9d0ca3cc54f70cecead9a0c269437f5a745c21c389755626ec2dfb9b79668ea1e7000fd86f1
+DIST kicad-2013-05-18-BZR4017-stable-UBUNTU_12.04_full_with_components_doc.tgz 280828915 SHA256 48c91acb9d4f45c7eebbcf4d602841896f11f22bb00721c62d351dd7241efd0b SHA512 8c4b81077c7e23bae6ad6a167fca7e34c006fc6a2a28457ddc276bef94ab43f6bf29f460a9ed5d9e564ef144a106ee82362b3cead3ca64b1361466d8d390619d WHIRLPOOL ed51fdc7ee287d65f4002250e79652d791d2aebe2fc872e1b853cfeccd287bf548346824ffc9afb599ff21721e972db7a5b3c134c662e883cd7d1e5c5b6c5abe
+DIST kicad-sources-stable_2013-05-18_BZR4017.zip 15025159 SHA256 cb9ca0d19e5ea8ca45c731eeddbd8a242eb696e619ee98af91f2c7a0095b393d SHA512 747e4719a426646cf38b9951d28aea32085d672371426b44d9f9a575b55e051925ae3fd6c98aea6fa2c21c2c6a6a2f6cc2da461c882b854d033f5d1ce58384ba WHIRLPOOL 69dbeed6da6d1400207c048a49008d6b0876df184d64c520b82e7e82e3826a04ada5563551f1498244ee4d67ec7731f81285a604e671ee73f6518f211ecb8ef0
 EBUILD kicad-20120119_p3256.ebuild 5245 SHA256 3bf4f773b7183057f1f967759d10efc9b98cbbc3c13b643d988b7c02bd518aed SHA512 f565a92e3cc0ab15696915b2dc985860db424f3c8aa03073a2c217b76cbe853e436dc38c54a659662d8eb6792ea67281279d413f379a8ed8bd5ee4e99c9d9046 WHIRLPOOL a4731d1c2fb22035b6840340ec9de2d02c8d7dea25c8ae96991de604b73153d83ddfbb773950df4f772c165833f23041738f98935766d6cec972806961ed31b1
+EBUILD kicad-20130518.ebuild 3323 SHA256 24a06ce5e1efa06ba31f69a64035bf94b18734c09b3d4f8a85496aa24cf3f125 SHA512 d5534570cdf3058f3e859e075ac3f3e1662f1439b35d8ca5ff77b3ef01078936ad4ddff2eba63d50aa0659edc798fec4eea3804b183c9640eb09320c7187400f WHIRLPOOL c004e269d1cf96d77c10210e7a87f49ef10c0ce4d4e6139c2ee5c48914a961714ddf6b75b6e02c57ce3867cd878b1e8933937040c3c7c8db1295e8d90b78d365
 EBUILD kicad-99999999.ebuild 5075 SHA256 8dfb5d8dda6e7242c5a9cc9bc2fd164ffb1ffd1c04c359023ee8096bf286e4a2 SHA512 cb50cbc23e5b5234710ca232c8d0f9889575651e834cba2cbba48ca4059bce119984aacd475d8750f8549c2cbf9e1be9b12523ba93a6c3a0a810cc735b848dc0 WHIRLPOOL 3fd9515c07c785f329af0e0da2ae947e02a95d599387251de40c5a58b27f3ff90872fc557dcb1a49f2e153aeef8696db3f32b8396dd292fbbc15582b39cd87fe
-MISC ChangeLog 9856 SHA256 7461d6f6951b748a8d8c30bc3e0627e66ce342de199f43ad558e28bfb59a805d SHA512 12ff6960f232a5c692f46b3064867e6a2461f4336f67b7616aef3343a50bdac494e723e7e9cf6fe12c7396b4bde641f525a36f4a42f707e444b9ab59f1591296 WHIRLPOOL 7954258960fc5579bbb89f900f6a187472128b051b249151e0e298bb6f34a57bbd3aeb4a05f7a9f8c65bc997e955fbdcf3a6d08a93154b010402aa6716cf74ea
+MISC ChangeLog 10154 SHA256 bb4bf3c5d6ddcf96497a5ecb83797d7b1cf3a6f6f253a60355301039dde8c107 SHA512 0feafd4e2d9455a1e8be27543d63d7f4a72c15788eb807b37c0ea98b5152ffe68417737cd9ab19e95a32260dc7fa1463e0972d98a6c7bc287fc6634af5828674 WHIRLPOOL 57d048af0fb07f1aa6213ecc373d11041228355b1a0155cae12de26abef844d034362ffc8d9e2db96af480d8b03974ecdab8f809f6cf9e63062b478a49153081
 MISC metadata.xml 498 SHA256 d3b97f4a2e5a5e7891080c5773998ee86ee485e2fd36b07fca0abc83c4599ff8 SHA512 e2a5a26be54c099fa8d6bab3ad0b3f5272e419d50c61e1ab7250c801408aca5bd9c23bf756290ae502016c14c2fecd0d370371b9fa6d79916db8b9ddc9ffee55 WHIRLPOOL 41a6c531359f7ef85ccce8f298adea86e12373be6c639666603010a5bc0dd1e6657d5cc7418d09a527e7e8153810c9928906dd1c18cb7b4b31c4ef439d223120
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
+}