Version bump, bug 432854

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

4 files changed, 124 insertions, 15 deletions

diff --git a/sci-electronics/fritzing/ChangeLog b/sci-electronics/fritzing/ChangeLog
index 00c77e9e3482..244dbbf402ba 100644
--- a/sci-electronics/fritzing/ChangeLog
+++ b/sci-electronics/fritzing/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/fritzing
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/fritzing/ChangeLog,v 1.2 2012/04/18 23:16:57 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/fritzing/ChangeLog,v 1.3 2012/10/25 18:57:42 idl0r Exp $
+
+*fritzing-0.7.10b (25 Oct 2012)
+
+  25 Oct 2012; Christian Ruppert <idl0r@gentoo.org> +fritzing-0.7.10b.ebuild,
+  +files/fritzing-0.7.10b-no_bundled_quazip.patch:
+  Version bump, bug 432854
 
 *fritzing-0.7.4b-r1 (18 Apr 2012)
 
diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest
index 34c282508e5c..b272e7edbf55 100644
--- a/sci-electronics/fritzing/Manifest
+++ b/sci-electronics/fritzing/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX no-bundled-boost.patch 527 RMD160 c98ca3fc697df6d0b7c068d9b4cb41d60eee5696 SHA1 9c7337337578bb49e5ca8bc619486c178d16433b SHA256 a1e8322cd340b81602be072949858273267c35ac91e957c103377bda7c3b08e1
-AUX no-bundled-quazip.patch 1235 RMD160 1b29b08d61607da489872d884382804430a5be0e SHA1 76f3e504c70efa685fa2677b6983098200ad294b SHA256 a6ba34b327e68e3a1436b911ad13978186161cc642bb4d36d8b60cd442a4a3ff
-DIST fritzing-0.7.4b.source.tar.bz2 10570293 RMD160 67448360b9fe44d6fcc7600239ec8c71f3c0fe1a SHA1 db79e9e639e5d424e296bc56dd88d73f91127cad SHA256 901076ed45ccddeed9ecef9cef8c599ca05f709337e59520257e7f6914d33079
-EBUILD fritzing-0.7.4b-r1.ebuild 1492 RMD160 2c49106132f2193f6edbb20ed2dc51f3842ed6d2 SHA1 c97643592a2b49b28d1e354ae801805df41fdcc8 SHA256 fda61877fbe3da00110385759e88aeef3eb47a937e25d7370eebeba692d0ec91
-MISC ChangeLog 680 RMD160 1198532ab19e077a380d02db677c62925428e2da SHA1 44448a0d3a71b5148de6e2c34f117dd436172d0e SHA256 e96db88477763e4382a0efc07847e2da63e4a496e59b9ae507b59ed3b61536e6
-MISC metadata.xml 235 RMD160 0716826a6dd51819a2d989fb883ad83c265e9818 SHA1 e37ad80a2c9aca6ae43658946bdd64a21235a600 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991
+AUX fritzing-0.7.10b-no_bundled_quazip.patch 1241 SHA256 a3945617ef2c90d885f15649c721fc8e291ca19af35e2f1c3543b21a7b5819e8 SHA512 276323039328d8c899869f25d479b97a0e5154c253c396a50eb73539863bedcdc758991de5f0816090aa29d8e14c24abf3489305cce704dd702c0e64a1db9e65 WHIRLPOOL 672b1676ac1ef1b4c5d57f6da29414d148508a239008e376c33386e18ced83525eb15c58d2885828f93ff9ad26784aad91cb87f14042464680bd6485e5e86a8b
+AUX no-bundled-boost.patch 527 SHA256 a1e8322cd340b81602be072949858273267c35ac91e957c103377bda7c3b08e1 SHA512 9d8d0f95260b465f925fbc7b1f1b5b8a1e3c647f712c5bf78c47c93bf23ba9669cb0c4f0dcba076a41cfdc42945d3819939d1176d49696e93aa1eef61d4918dc WHIRLPOOL d394f2a546ac43afd2fc746cbf37b1689e51975be62a135722d1e1ef1e5d1c22ba5e866d4f24ad6bf9f5e34366a756572db17d135320e81357fc17eabc989474
+AUX no-bundled-quazip.patch 1235 SHA256 a6ba34b327e68e3a1436b911ad13978186161cc642bb4d36d8b60cd442a4a3ff SHA512 d6c4c38d9370142d9eaf044c4bce4e70bec2a79fc47fdb09d4d5ebb0fd7232d5867f588854949024a696623c2b4b1107351f4ce8a01f7e0325d3c5216b6e91c2 WHIRLPOOL e663f2f7457024037fa6a428b0a091a6c693f25f8407de1c1a99a8fe10dec673754c180cdb41ad1fa0a2baa43bc769707cc263191770e5ec0ad6cd586ebb54cc
+DIST fritzing-0.7.10b.source.tar.bz2 12891973 SHA256 a1d4b2a5529da7b5e9cb3a958508cbcf482519baf0f13bd044f524020bc24208 SHA512 bd4c77aa442bb3610d95164e6513ef96cff7655ca617570cb25d221535979f7dd1d964387106ba27b8b3ecfd53e73422c85b2ab8a4d6dc7cf968d95cb88cce16 WHIRLPOOL 466225ca2de498e040bb7866889058e0b46cdf36a48cb07e3c55c7ac023d992af66f5f427388f9c2d946f8231c69fe498777869e0bfbbae65f9aad2055f39428
+DIST fritzing-0.7.4b.source.tar.bz2 10570293 SHA256 901076ed45ccddeed9ecef9cef8c599ca05f709337e59520257e7f6914d33079 SHA512 a77336c116065ade449e4684caf83fc2bc71e1fb428e3fc13eca3d1b6338702fb2c5977eabe3fb2db29d1bdc80df95b2ad028be95f19fc86c657c85a0fecaacd WHIRLPOOL 46ecd9e313a9ac8d962dc505908ede23e3c0d71bc63352a33ff25189e7a18044b4c68371f963bfc138f27952f67b731973e1f4db5269134bba531bbf90c83322
+EBUILD fritzing-0.7.10b.ebuild 1557 SHA256 24e3bd10fdc3e0dc4d3eef518c8c4f8ce91bafc34a438c24da74294e9216e550 SHA512 ad061a98638a94ea6d9c31fd5ea68c2ff1560d95542d1e1b3025891d7457427507cac99012826501d06a5c917b3bdf22340a40e6885afc81b6f296edf6579c79 WHIRLPOOL 2a13d06e36b66f2aae33b8b231d0383803e01691ef335b87083cd32dc69014cf7a4eb2354f5fdf10553c2ff367ee20af99ab7d762b858007368e060f0967ac62
+EBUILD fritzing-0.7.4b-r1.ebuild 1492 SHA256 fda61877fbe3da00110385759e88aeef3eb47a937e25d7370eebeba692d0ec91 SHA512 c037768701cbfe404da0aaafa55ebc3306c950bfa77ead9767271a5fa6dfa0e89c34c2e2eebaec56600c05d28aa957c290aa4628715cc2292038bbe5a851641b WHIRLPOOL 29b20629b7a809b1899bab03637b548e2a6f4d24b4b8e975f8ac17c3a300dc88b86b4cd85380b0d442a400becfd3d63303996da4e43a7c9b0acf6af7fb7db6a5
+MISC ChangeLog 870 SHA256 b30ccc70dbefac8f0a9bbed2aeaf55d9a86850e69d707c07a60da65bb51134dd SHA512 4cb9bf2724ece3b121e9db72709832e4628af432b86926104625f877b09c59973725c6c847a3868b16d7bbf1f5551dfc383eabe1de9a2feffd78a8dd7ea2782c WHIRLPOOL 9180565a227c2e2aa09c6102d2b12a0df810d1ac59d4f220b1bce062d85f8af53c1338ad833f1d8a8031200bdf3b4b017af87005e6fa86c6c28da17d39bfcb6f
+MISC metadata.xml 235 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991 SHA512 0f45c3328380643ee0ef6bccc13ca318f26525fbcf9669527745a51e5c910532f1b5aef64247f5cf019a7515df659909427a76e3691edb878f5c31b172d9b4e1 WHIRLPOOL 0b2b4c1e5917851d05a390f05eaad3cd094439b542857e42fc6c4183cf65664b2f8b153d2d11b465494523925bcaf1215c4d485a63f4c9443df769e05c0a9e9d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPj0tyAAoJEMOx0zmdw4Z1Ix4H+wdP0hZEsIojGcJ3CiXrpNDl
-n2eS71fsmRf9ripU0ALxYsZ5vuwt9nmGnyc4W4ZBLp/au2uc5EeZMhhIqA0sRajV
-fi3JYwQDVjeRUBs3txkixNVfG2VZuPA/ejDO6tGjBURjdgfwZ19sLau9n3/Dnt4c
-DiOKBe89yuwZyIOBdbLUArWGAdOtSM4zX0UN31h6D9YKT8oNaiDpxioBA4OotQ+L
-z15YWXH2ysAzCMFZ1wY49i24Ou5L58Uh4+45dXY44bVzSg+mMI2Cncr7Sn6oSuNJ
-ZbAt7yQ4QEh1JdvJPDcq/Tz2iBOr2quC081jPwICDMHLLZ8c8CC6vDgqWwgfKt4=
-=Vx2X
+iQEcBAEBCAAGBQJQiYuqAAoJEMOx0zmdw4Z1Z9UH/34O+4plNqa+ce1O+2CDlWhi
+s18KoLvoxRGILclzUppwz1D8oqjUMak/f9AnYtQgANDrn/kdDM2ZAiRq6B2Kijk9
+EoaOL+PkBn5ZjTKbkLhih7m4hmOZbSx9Y7pMJcJK9OzpX/OC4cLQ0jexvaicXQUO
+rBkovDbUFE1Grifc4XTNSUYdi7ia1dpYFtzH/IOXp9ESA7m1DlVAGL+pPQ+7uQY9
+g4O3+RBHBUUM+yN7ALUJhiG2eTDE3lv1So201QH3wQl/afBt2plql5exOzACmWKe
+1JEBDcuAQTRpqHTSXFDmk4emM86/8wEsfIC76HmfJmuq2gAZnaJmjNgIy7RVZhg=
+=8asG
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/fritzing/files/fritzing-0.7.10b-no_bundled_quazip.patch b/sci-electronics/fritzing/files/fritzing-0.7.10b-no_bundled_quazip.patch
new file mode 100644
index 000000000000..fe39a669c9d1
--- /dev/null
+++ b/sci-electronics/fritzing/files/fritzing-0.7.10b-no_bundled_quazip.patch
@@ -0,0 +1,44 @@
+Do not bundle QuaZip
+
+https://code.google.com/p/fritzing/issues/detail?id=1898
+
+Christian Ruppert <idl0r@gentoo.org>
+
+Index: src/utils/folderutils.cpp
+===================================================================
+--- src/utils/folderutils.cpp	(revision 5978)
++++ src/utils/folderutils.cpp	(working copy)
+@@ -34,8 +34,8 @@
+ #include <QCryptographicHash>

+ 

+ #include "../debugdialog.h"

+-#include "../lib/quazip/quazip.h"

+-#include "../lib/quazip/quazipfile.h"

++#include <quazip/quazip.h>

++#include <quazip/quazipfile.h>

+ #include "../lib/qtsysteminfo/QtSystemInfo.h"

+ 

+ 

+Index: pri/utils.pri
+===================================================================
+--- pri/utils.pri	(revision 5978)
++++ pri/utils.pri	(working copy)
+@@ -67,5 +65,4 @@
+ src/utils/textutils.cpp \

+ src/utils/zoomslider.cpp 

+ 

+-

+-

++LIBS += -lquazip

+Index: phoenix.pro
+===================================================================
+--- phoenix.pro	(revision 5978)
++++ phoenix.pro	(working copy)
+@@ -106,7 +106,6 @@
+ RESOURCES += phoenixresources.qrc

+ 	include(pri/kitchensink.pri)

+	include(pri/mainwindow.pri)

+-	include(pri/quazip.pri)

+ 	include(pri/partsbinpalette.pri)

+ 	include(pri/partseditor.pri)

+ 	include(pri/referencemodel.pri)

diff --git a/sci-electronics/fritzing/fritzing-0.7.10b.ebuild b/sci-electronics/fritzing/fritzing-0.7.10b.ebuild
new file mode 100644
index 000000000000..8d6d3aa48253
--- /dev/null
+++ b/sci-electronics/fritzing/fritzing-0.7.10b.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/fritzing/fritzing-0.7.10b.ebuild,v 1.1 2012/10/25 18:57:42 idl0r Exp $
+
+EAPI=4
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Electronic Design Automation"
+HOMEPAGE="http://fritzing.org/"
+SRC_URI="http://fritzing.org/download/${PV}/source-tarball/${P}.source.tar.bz2"
+
+LICENSE="CCPL-Attribution-ShareAlike-3.0 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-sql:4[sqlite]
+	dev-libs/quazip"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.40"
+
+S="${WORKDIR}/${P}.source"
+
+src_prepare() {
+	local translations=
+
+	qt4-r2_src_prepare
+
+	# Get a rid of the bundled libs
+	# Bug 412555 and
+	# https://code.google.com/p/fritzing/issues/detail?id=1898
+	rm -rf src/lib/quazip pri/quazip.pri src/lib/boost*
+
+	# Fritzing doesn't need zlib
+	sed -i -e 's:LIBS += -lz::' phoenix.pro || die
+
+	epatch "${FILESDIR}/${P}-no_bundled_quazip.patch"
+	epatch "${FILESDIR}/no-bundled-boost.patch"
+
+	edos2unix ${PN}.desktop
+
+	# Somewhat evil but IMHO the best solution
+	for lang in $LINGUAS; do
+		lang=${lang/linguas_}
+		[ -f "translations/${PN}_${lang}.qm" ] && translations+=" translations/${PN}_${lang}.qm"
+	done
+	if [ -n "${translations}" ]; then
+		sed -i -e "s:\(translations.extra =\) .*:\1	cp -p ${translations} \$(INSTALL_ROOT)\$\$PKGDATADIR/translations\r:" phoenix.pro || die
+	else
+		sed -i -e "s:translations.extra = .*:\r:" phoenix.pro || die
+	fi
+}