[gentoo-commits] proj/qt:master commit in: sci-electronics/fritzing/files/, sci-electronics/fritzing/

[gentoo-commits] proj/qt:master commit in: sci-electronics/fritzing/files/, sci-electronics/fritzing/

[Michael Palimaka]

commit:     8fa2938eac8ad7e81c1411aba4829ef33440c756
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Thu Mar 15 09:04:23 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Thu Mar 15 09:04:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8fa2938e

[sci-electronics/fritzing] Version bump to 0.7.1b for bug #403131

(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit)

---
 sci-electronics/fritzing/Manifest                  |    2 +-
 .../files/fritzing-0.7.1b-bundledlibs.patch        |   43 +++++++++++++++
 sci-electronics/fritzing/fritzing-0.3.13b.ebuild   |   34 ------------
 sci-electronics/fritzing/fritzing-0.7.1b.ebuild    |   58 ++++++++++++++++++++
 4 files changed, 102 insertions(+), 35 deletions(-)

diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest
index d5b6c0f..436d7da 100644
--- a/sci-electronics/fritzing/Manifest
+++ b/sci-electronics/fritzing/Manifest
@@ -1 +1 @@
-DIST fritzing.2009.12.11.source.tar.bz2 4107483 RMD160 945446ba1b2d2e2bdfcb7f66968b6ab42fef4be4 SHA1 eb4539d04db5cff0d6cf4bb7143fe7373496ad5b SHA256 dc74fc13ef29acffd456e78d90bb5067d9fb141c09b9187edc300444bd7537b9
+DIST fritzing-0.7.1b.source.tar.bz2 11848033 SHA256 438af1f15f278d7e38c8eb7920d220d3dbded96884ca9edf2c81fbcec82f1bc5 SHA512 e4caf62c74ba46fb204eaefffec83d15bf7d2bc5979cf1d3f45e550df17e45d0c1ffb42cbf20c6cf5ca5ad74978882ea856f4e33fc098eecd058b2f3576377c7 WHIRLPOOL 1b10aa57ac0bf2437c7e3a85b9e8465ce8a0c6070c9811b4f4a3e924e0d79339a390d4d0dfe69aa84f5c62a25c364c9e880ffe57af3d7af638965cfc9e63a1d0

diff --git a/sci-electronics/fritzing/files/fritzing-0.7.1b-bundledlibs.patch b/sci-electronics/fritzing/files/fritzing-0.7.1b-bundledlibs.patch
new file mode 100644
index 0000000..a3c3cb1
--- /dev/null
+++ b/sci-electronics/fritzing/files/fritzing-0.7.1b-bundledlibs.patch
@@ -0,0 +1,43 @@
+--- phoenix.pro
++++ phoenix.pro
+@@ -59,7 +59,7 @@
+         } else {
+             DEFINES += LINUX_32
+ 	}
+-	LIBS += -lz
++	LIBS += -lquazip
+     }
+     
+ 	isEmpty(PREFIX) {
+@@ -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)
+--- src/utils/folderutils.cpp
++++ src/utils/folderutils.cpp
+@@ -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"
+ 
+ 
+--- pri/utils.pri
++++ pri/utils.pri
+@@ -17,8 +17,6 @@
+ # $Date: 2012-02-01 10:30:37 +0100 (Wed, 01 Feb 2012) $
+ # ********************************************************************/
+ 
+-INCLUDEPATH += src/lib/boost_1_43_0
+-
+ HEADERS += \
+ src/utils/abstractimagebutton.h \
+ src/utils/abstractstatesbutton.h \

diff --git a/sci-electronics/fritzing/fritzing-0.3.13b.ebuild b/sci-electronics/fritzing/fritzing-0.3.13b.ebuild
deleted file mode 100644
index 7d2e2ac..0000000
--- a/sci-electronics/fritzing/fritzing-0.3.13b.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-MY_P="fritzing.2009.12.11.source"
-
-inherit qt4
-
-DESCRIPTION="breadboard and arduino prototyping"
-HOMEPAGE="http://fritzing.org/"
-SRC_URI="http://fritzing.org/download/${PV}/source-tarball/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3 CCPL-Attribution-ShareAlike-3.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="x11-libs/qt-gui:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-webkit:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure(){
-	eqmake4 phoenix.pro || die "eqmake4 failed"
-}
-
-src_install(){
-	dobin Fritzing || die "install failed"
-}

diff --git a/sci-electronics/fritzing/fritzing-0.7.1b.ebuild b/sci-electronics/fritzing/fritzing-0.7.1b.ebuild
new file mode 100644
index 0000000..0688fc5
--- /dev/null
+++ b/sci-electronics/fritzing/fritzing-0.7.1b.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+MY_P="${P}.source"
+MY_PN="Fritzing"
+LANGS="ar bg cs de el en es et fr gl hi hu it ja ko nl pl ro ru sv th tr"
+LANGSLONG="pt_BR pt_PT zh_CN zh_TW"
+
+inherit eutils qt4-edge
+
+DESCRIPTION="breadboard and arduino prototyping"
+HOMEPAGE="http://fritzing.org/"
+SRC_URI="http://fritzing.org/download/${PV}/source-tarball/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3 CCPL-Attribution-ShareAlike-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/boost
+	dev-libs/quazip
+	>=x11-libs/qt-core-4.6:4
+	>=x11-libs/qt-gui-4.6:4
+	>=x11-libs/qt-sql-4.6:4
+	>=x11-libs/qt-svg-4.6:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="README.txt"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-bundledlibs.patch
+
+	# required for it to validate
+	edos2unix ${PN}.desktop
+
+	local alllangs="${LANGS} ${LANGSLONG}"
+	local lang
+	for lang in $alllangs; do
+		if ! use linguas_${lang%_*} ; then
+			lang="$(tr [:upper:] [:lower:] <<< "$lang")"
+			rm translations/${PN}_${lang}.*
+		fi
+	done
+}
+
+src_configure() {
+	eqmake4 phoenix.pro
+}
+
+src_install() {
+	doman ${MY_PN}.1
+	qt4-edge_src_install
+}