Version bump, bug 432854

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

3 files changed, 107 insertions, 1 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/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
+}