Version bump, bug 454168

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

5 files changed, 131 insertions, 64 deletions

diff --git a/sci-electronics/fritzing/ChangeLog b/sci-electronics/fritzing/ChangeLog
index 244dbbf402ba..d32f9ffb77d6 100644
--- a/sci-electronics/fritzing/ChangeLog
+++ b/sci-electronics/fritzing/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2012/10/25 18:57:42 idl0r Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/fritzing/ChangeLog,v 1.4 2013/01/28 22:58:53 idl0r Exp $
+
+*fritzing-0.7.11b (28 Jan 2013)
+
+  28 Jan 2013; Christian Ruppert <idl0r@gentoo.org> -fritzing-0.7.4b-r1.ebuild,
+  +fritzing-0.7.11b.ebuild, +files/fritzing-0.7.11b-no_bundled_quazip.patch,
+  -files/no-bundled-quazip.patch:
+  Version bump, bug 454168
 
 *fritzing-0.7.10b (25 Oct 2012)
 
diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest
index b272e7edbf55..da71d6939a44 100644
--- a/sci-electronics/fritzing/Manifest
+++ b/sci-electronics/fritzing/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA256
 
 AUX fritzing-0.7.10b-no_bundled_quazip.patch 1241 SHA256 a3945617ef2c90d885f15649c721fc8e291ca19af35e2f1c3543b21a7b5819e8 SHA512 276323039328d8c899869f25d479b97a0e5154c253c396a50eb73539863bedcdc758991de5f0816090aa29d8e14c24abf3489305cce704dd702c0e64a1db9e65 WHIRLPOOL 672b1676ac1ef1b4c5d57f6da29414d148508a239008e376c33386e18ced83525eb15c58d2885828f93ff9ad26784aad91cb87f14042464680bd6485e5e86a8b
+AUX fritzing-0.7.11b-no_bundled_quazip.patch 3183 SHA256 96b5704ef6468e1557b063f6968031bf0e536f0a341c459f41df5826868823c2 SHA512 200971a643a6625343999c141b40821d86fa38e186492055bf63b98d5586afc36e1a883b0979c03614af1a13c44becd987f520e870e9b5bbdf6884497b60e23d WHIRLPOOL b91089b5f1d1646d87bf572439f704a05a1b46b919c562d7100c2d3515e0b2098983eaf6c57037db61943c015402f6f5b3fc7682b18937e8acfcd4fc20570ba6
 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
+DIST fritzing-0.7.11b.source.tar.bz2 11720093 SHA256 51da9ccc4048aa628f88933f11b0487581a80b4471c7cbb0a0c530296eb09ab2 SHA512 18693193beb48c903351dc8b9c3704d7185066e48223ecc0a930f1f3f803f90254245fc0c51b8bbaca19349d120f6784d5c72c80cb80cabe49fb3f2a02ba7df7 WHIRLPOOL 9930c907ef260d4c552daab050f3222734453cfcba17d23d83d8a83a4d9f3cf506ec816104174f09f1a9c0acb4892eba54c09e370f5d5e381885d2446b6ae96e
 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
+EBUILD fritzing-0.7.11b.ebuild 1558 SHA256 4ae63a63f24728da99ea7c3b12293597d26662eb6b81f0a6dc949249af6b37f6 SHA512 75e90400a8b91e1df56bfb20d765d341c335fdb69ca245b3d7732071193bca4b233f9bf020b47d03b70c67116eac611088ab5bad1dedd080aaae3da6a13ff710 WHIRLPOOL eb4beecd8568a466d79c41e81360fef79c7a2fdeb2e988e554a67c9b998a23efaea1b5bdf160a720b8c533e53c5ba78af0a41ee25e637b47e57be1d3c1a138fa
+MISC ChangeLog 1122 SHA256 19c72d561361f8da081aa32b31a0c10525dc41b2750fa80f51eb51fba0f46275 SHA512 f268ea54545fb11b48e75b3667792b99a880eef525750df31b2f4f18cfe86477393b65b573832f5022bba3d8cb2d282e7a8d50fb509a7e283c174f659683ea82 WHIRLPOOL 0d582a07a51f58ef5d96499c3cfaced93b4b5f2bb82314b63f541c047f78ba1932ecd8e727d950bc9116d5251fad0f592d6911c21a8580453771fbd4ba3bec00
 MISC metadata.xml 235 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991 SHA512 0f45c3328380643ee0ef6bccc13ca318f26525fbcf9669527745a51e5c910532f1b5aef64247f5cf019a7515df659909427a76e3691edb878f5c31b172d9b4e1 WHIRLPOOL 0b2b4c1e5917851d05a390f05eaad3cd094439b542857e42fc6c4183cf65664b2f8b153d2d11b465494523925bcaf1215c4d485a63f4c9443df769e05c0a9e9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQiYuqAAoJEMOx0zmdw4Z1Z9UH/34O+4plNqa+ce1O+2CDlWhi
-s18KoLvoxRGILclzUppwz1D8oqjUMak/f9AnYtQgANDrn/kdDM2ZAiRq6B2Kijk9
-EoaOL+PkBn5ZjTKbkLhih7m4hmOZbSx9Y7pMJcJK9OzpX/OC4cLQ0jexvaicXQUO
-rBkovDbUFE1Grifc4XTNSUYdi7ia1dpYFtzH/IOXp9ESA7m1DlVAGL+pPQ+7uQY9
-g4O3+RBHBUUM+yN7ALUJhiG2eTDE3lv1So201QH3wQl/afBt2plql5exOzACmWKe
-1JEBDcuAQTRpqHTSXFDmk4emM86/8wEsfIC76HmfJmuq2gAZnaJmjNgIy7RVZhg=
-=8asG
+iQEcBAEBCAAGBQJRBwKxAAoJEMOx0zmdw4Z1ceQH/3uqtrijrTX7LBphaRo6BOIZ
+ORUl2aH3TaYw8E56x7xfXmwSREcli+7ElZfcvAFSR3KA/MrYEffEp63NqmEGanDU
+t3t55Ye5fQE5ekqEWiogUlfVoGWPW6fFvyzI/z+VlKvpjfsF36Basdhz7HFDmFKj
+R+ZjisYr8fG2ofVcNfcjQUhBMF/OLV5+00maRxqTppZ9nk/XrVeTJpSJv6ETCO06
+Yy/MkKcS8bKhj7Qbk7AHuKUc5hhXSLoFPWpWSU3xM/5+IKQeN3ygcgat/nhs2Kj3
+V6jnJ+T7JL4VrpvZOUXlXoLG2q17WBi9psBibhUi00U4iDhpOmjEwXgOMEHMTKU=
+=HCqh
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/fritzing/files/fritzing-0.7.11b-no_bundled_quazip.patch b/sci-electronics/fritzing/files/fritzing-0.7.11b-no_bundled_quazip.patch
new file mode 100644
index 000000000000..b51f79e05083
--- /dev/null
+++ b/sci-electronics/fritzing/files/fritzing-0.7.11b-no_bundled_quazip.patch
@@ -0,0 +1,102 @@
+diff --git a/phoenix.pro b/phoenix.pro
+index 8232c54..241eb61 100644
+--- a/phoenix.pro
++++ b/phoenix.pro
+@@ -115,7 +115,6 @@ RC_FILE = fritzing.rc
+ 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/pri/utils.pri b/pri/utils.pri
+index 94f18c1..ab0de4f 100644
+--- a/pri/utils.pri
++++ b/pri/utils.pri
+@@ -68,4 +68,4 @@ src/utils/textutils.cpp \
+ src/utils/zoomslider.cpp 

+ 

+ 

+-

++LIBS += -lquazip

+diff --git a/src/autoroute/panelizer.cpp b/src/autoroute/panelizer.cpp
+index 38db81a..9bdeb2f 100644
+--- a/src/autoroute/panelizer.cpp
++++ b/src/autoroute/panelizer.cpp
+@@ -25,22 +25,22 @@ $Date: 2013/01/28 22:58:53 $
+ ********************************************************************/
+ 
+ #include "panelizer.h"
+-#include "../../debugdialog.h"
+-#include "../../sketch/pcbsketchwidget.h"
+-#include "../../utils/textutils.h"
+-#include "../../utils/graphicsutils.h"
+-#include "../../utils/folderutils.h"
+-#include "../../utils/folderutils.h"
+-#include "../../items/resizableboard.h"
+-#include "../../items/logoitem.h"
+-#include "../../items/groundplane.h"
+-#include "../../fsvgrenderer.h"
+-#include "../../fapplication.h"
+-#include "../../svg/gerbergenerator.h"
+-#include "../../referencemodel/referencemodel.h"
+-#include "../../version/version.h"
+-#include "../../processeventblocker.h"
+-#include "../../connectors/connectoritem.h"
++#include "../debugdialog.h"
++#include "../sketch/pcbsketchwidget.h"
++#include "../utils/textutils.h"
++#include "../utils/graphicsutils.h"
++#include "../utils/folderutils.h"
++#include "../utils/folderutils.h"
++#include "../items/resizableboard.h"
++#include "../items/logoitem.h"
++#include "../items/groundplane.h"
++#include "../fsvgrenderer.h"
++#include "../fapplication.h"
++#include "../svg/gerbergenerator.h"
++#include "../referencemodel/referencemodel.h"
++#include "../version/version.h"
++#include "../processeventblocker.h"
++#include "../connectors/connectoritem.h"
+ 
+ #include "cmrouter/tileutils.h"
+ 
+diff --git a/src/autoroute/panelizer.h b/src/autoroute/panelizer.h
+index a21dbf2..f6f36a4 100644
+--- a/src/autoroute/panelizer.h
++++ b/src/autoroute/panelizer.h
+@@ -30,8 +30,8 @@ $Date: 2013/01/28 22:58:53 $
+ #include <QString>

+ #include <QSizeF>

+ 

+-#include "../../mainwindow/mainwindow.h"

+-#include "../../items/itembase.h"

++#include "../mainwindow/mainwindow.h"

++#include "../items/itembase.h"

+ #include "cmrouter/tile.h"

+ 

+ 

+diff --git a/src/utils/folderutils.cpp b/src/utils/folderutils.cpp
+index bba0b9e..a84da8f 100644
+--- a/src/utils/folderutils.cpp
++++ b/src/utils/folderutils.cpp
+@@ -34,8 +34,8 @@ $Date: 2013/01/28 22:58:53 $
+ #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"

+ 

+ 

+@@ -552,4 +552,4 @@ void FolderUtils::copyBin(const QString & dest, const QString & source) {
+ #endif

+ 

+     );

+-}
+\ No newline at end of file
++}

diff --git a/sci-electronics/fritzing/files/no-bundled-quazip.patch b/sci-electronics/fritzing/files/no-bundled-quazip.patch
deleted file mode 100644
index 6e1a89cb4751..000000000000
--- a/sci-electronics/fritzing/files/no-bundled-quazip.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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)
-@@ -69,5 +67,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 @@
- RC_FILE = fritzing.rc

- RESOURCES += phoenixresources.qrc

- 	include(pri/kitchensink.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.4b-r1.ebuild b/sci-electronics/fritzing/fritzing-0.7.11b.ebuild
index cecc40e2a1ae..70e19146682e 100644
--- a/sci-electronics/fritzing/fritzing-0.7.4b-r1.ebuild
+++ b/sci-electronics/fritzing/fritzing-0.7.11b.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/fritzing/fritzing-0.7.4b-r1.ebuild,v 1.1 2012/04/18 23:16:57 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/fritzing/fritzing-0.7.11b.ebuild,v 1.1 2013/01/28 22:58:53 idl0r Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils qt4-r2
 
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="sys-libs/zlib
-	x11-libs/qt-core:4
+RDEPEND="x11-libs/qt-core:4
 	x11-libs/qt-gui:4
 	x11-libs/qt-svg:4
 	x11-libs/qt-sql:4[sqlite]
@@ -34,9 +33,12 @@ 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/libs/quazip pri/quazip.pri src/libs/boost*
+	rm -rf src/lib/quazip/ pri/quazip.pri src/lib/boost*
 
-	epatch "${FILESDIR}/no-bundled-quazip.patch"
+	# 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