Do not bundle boot and quazip. Respect LINGUAS, install a valid .desktop file, bug 412555.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

6 files changed, 137 insertions, 35 deletions

diff --git a/sci-electronics/fritzing/ChangeLog b/sci-electronics/fritzing/ChangeLog
index 9aa40c4f7b66..00c77e9e3482 100644
--- a/sci-electronics/fritzing/ChangeLog
+++ b/sci-electronics/fritzing/ChangeLog
@@ -1,6 +1,14 @@
 # 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.1 2012/04/18 17:26:18 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/fritzing/ChangeLog,v 1.2 2012/04/18 23:16:57 idl0r Exp $
+
+*fritzing-0.7.4b-r1 (18 Apr 2012)
+
+  18 Apr 2012; Christian Ruppert <idl0r@gentoo.org> -fritzing-0.7.4b.ebuild,
+  +fritzing-0.7.4b-r1.ebuild, +files/no-bundled-boost.patch,
+  +files/no-bundled-quazip.patch:
+  Do not bundle boot and quazip. Respect LINGUAS, install a valid .desktop
+  file, bug 412555.
 
 *fritzing-0.7.4b (18 Apr 2012)
 
diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest
index bebbc369758f..34c282508e5c 100644
--- a/sci-electronics/fritzing/Manifest
+++ b/sci-electronics/fritzing/Manifest
@@ -1,18 +1,20 @@
 -----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.ebuild 660 RMD160 eb07ac26825c89e70afbacad1d1fc52dd422260a SHA1 edb2caecbe5dfc4cd884fe3ad97436e915e12d3b SHA256 e2f8bb9577ccd718c652bbfc44ec1c5112f4f9a8f4c724db8617d466faa11a83
-MISC ChangeLog 377 RMD160 7d7e080cb3c2a73f343224277dcba9ae500d8e7c SHA1 540b1f37880e441f47dc86e2d69ca65cead29847 SHA256 d86f15707bccaeb406a9de93cb856dc204e4ae80415e9708a74bac5e5dc17017
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPjvlCAAoJEMOx0zmdw4Z1wDQH/R6uQyg+9Pdsulpu6igjHobE
-WgPOpQfWcG6yIjYS4rcr29h0HLHV67hH1Kc3XYl3LL6ayJEJaHKD1iMDhUfLxAUh
-uO4rxm1I4IlRNfnlr2lVFmWBoJHAYj5xniTR42KR5/2rnM+ilLcY9KMu0GtDLoHQ
-zfqaBXwFjyhYAF1tFy+4a6u0gutJDTjYjrQ08SSD44NEWYkfhrTYYDvzWYZ8dmJZ
-hQxpWK6agnAZ8oAwCVvh733UH9hQ0KY8sdmJZK1XV7lc1dhNXUin/vJvHXlQJ7rG
-K+m3/bpRiprgawuwcdKP2C6nlCtDRtUbaJiWMKzWZ0oNhnPTQnNpYdDM4nFbUxE=
-=R/ar
+iQEcBAEBCAAGBQJPj0tyAAoJEMOx0zmdw4Z1Ix4H+wdP0hZEsIojGcJ3CiXrpNDl
+n2eS71fsmRf9ripU0ALxYsZ5vuwt9nmGnyc4W4ZBLp/au2uc5EeZMhhIqA0sRajV
+fi3JYwQDVjeRUBs3txkixNVfG2VZuPA/ejDO6tGjBURjdgfwZ19sLau9n3/Dnt4c
+DiOKBe89yuwZyIOBdbLUArWGAdOtSM4zX0UN31h6D9YKT8oNaiDpxioBA4OotQ+L
+z15YWXH2ysAzCMFZ1wY49i24Ou5L58Uh4+45dXY44bVzSg+mMI2Cncr7Sn6oSuNJ
+ZbAt7yQ4QEh1JdvJPDcq/Tz2iBOr2quC081jPwICDMHLLZ8c8CC6vDgqWwgfKt4=
+=Vx2X
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/fritzing/files/no-bundled-boost.patch b/sci-electronics/fritzing/files/no-bundled-boost.patch
new file mode 100644
index 000000000000..d6fdfe6b8b8a
--- /dev/null
+++ b/sci-electronics/fritzing/files/no-bundled-boost.patch
@@ -0,0 +1,19 @@
+Use system boost
+
+https://code.google.com/p/fritzing/issues/detail?id=1898
+
+Christian Ruppert <idl0r@gentoo.org>
+
+Index: pri/utils.pri
+===================================================================
+--- pri/utils.pri	(revision 5978)
++++ pri/utils.pri	(working copy)
+@@ -17,8 +17,6 @@
+ # $Date: 2012/04/18 23:16:58 $

+ # ********************************************************************/

+ 

+-INCLUDEPATH += src/lib/boost_1_43_0

+-

+ HEADERS += \

+ src/utils/abstractimagebutton.h \

+ src/utils/abstractstatesbutton.h \

diff --git a/sci-electronics/fritzing/files/no-bundled-quazip.patch b/sci-electronics/fritzing/files/no-bundled-quazip.patch
new file mode 100644
index 000000000000..6e1a89cb4751
--- /dev/null
+++ b/sci-electronics/fritzing/files/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)
+@@ -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.4b-r1.ebuild
new file mode 100644
index 000000000000..cecc40e2a1ae
--- /dev/null
+++ b/sci-electronics/fritzing/fritzing-0.7.4b-r1.ebuild
@@ -0,0 +1,54 @@
+# 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.4b-r1.ebuild,v 1.1 2012/04/18 23:16:57 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="sys-libs/zlib
+	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/libs/quazip pri/quazip.pri src/libs/boost*
+
+	epatch "${FILESDIR}/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
+}
diff --git a/sci-electronics/fritzing/fritzing-0.7.4b.ebuild b/sci-electronics/fritzing/fritzing-0.7.4b.ebuild
deleted file mode 100644
index 66e214c33d13..000000000000
--- a/sci-electronics/fritzing/fritzing-0.7.4b.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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.4b.ebuild,v 1.1 2012/04/18 17:26:18 idl0r Exp $
-
-EAPI=4
-
-inherit 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=""
-
-DEPEND="sys-libs/zlib
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-sql:4[sqlite]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}.source"