Version bump, bug 454168

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

4 files changed, 120 insertions, 53 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/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