summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Rüger <mrueg@gentoo.org>2014-02-05 01:16:30 +0000
committerManuel Rüger <mrueg@gentoo.org>2014-02-05 01:16:30 +0000
commit4ecaefe123d64a20d4b406762d2d243cdeef7d0a (patch)
tree588b3e96cd8186779f901a41e705a9b0ce41c591 /sci-electronics/fritzing
parentVersion bump. (diff)
downloadgentoo-2-4ecaefe123d64a20d4b406762d2d243cdeef7d0a.tar.gz
gentoo-2-4ecaefe123d64a20d4b406762d2d243cdeef7d0a.tar.bz2
gentoo-2-4ecaefe123d64a20d4b406762d2d243cdeef7d0a.zip
Version bump. Cleanup old.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'sci-electronics/fritzing')
-rw-r--r--sci-electronics/fritzing/ChangeLog10
-rw-r--r--sci-electronics/fritzing/files/fritzing-0.7.11b-no_bundled_quazip.patch102
-rw-r--r--sci-electronics/fritzing/files/no-bundled-boost.patch19
-rw-r--r--sci-electronics/fritzing/fritzing-0.7.11b.ebuild56
-rw-r--r--sci-electronics/fritzing/fritzing-0.7.12b.ebuild57
-rw-r--r--sci-electronics/fritzing/fritzing-0.8.7b.ebuild (renamed from sci-electronics/fritzing/fritzing-0.8.3b.ebuild)4
6 files changed, 11 insertions, 237 deletions
diff --git a/sci-electronics/fritzing/ChangeLog b/sci-electronics/fritzing/ChangeLog
index f08abe1787d6..61def3489004 100644
--- a/sci-electronics/fritzing/ChangeLog
+++ b/sci-electronics/fritzing/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sci-electronics/fritzing
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/fritzing/ChangeLog,v 1.10 2014/01/05 19:02:26 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/fritzing/ChangeLog,v 1.11 2014/02/05 01:16:30 mrueg Exp $
+
+*fritzing-0.8.7b (05 Feb 2014)
+
+ 05 Feb 2014; Manuel Rüger <mrueg@gentoo.org> +fritzing-0.8.7b.ebuild,
+ -files/fritzing-0.7.11b-no_bundled_quazip.patch,
+ -files/no-bundled-boost.patch, -fritzing-0.7.11b.ebuild,
+ -fritzing-0.7.12b.ebuild, -fritzing-0.8.3b.ebuild:
+ Version bump. Cleanup old.
*fritzing-0.8.5b (05 Jan 2014)
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
deleted file mode 100644
index b51f79e05083..000000000000
--- a/sci-electronics/fritzing/files/fritzing-0.7.11b-no_bundled_quazip.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-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-boost.patch b/sci-electronics/fritzing/files/no-bundled-boost.patch
deleted file mode 100644
index d6fdfe6b8b8a..000000000000
--- a/sci-electronics/fritzing/files/no-bundled-boost.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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/fritzing-0.7.11b.ebuild b/sci-electronics/fritzing/fritzing-0.7.11b.ebuild
deleted file mode 100644
index 0c02435000e0..000000000000
--- a/sci-electronics/fritzing/fritzing-0.7.11b.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.11b.ebuild,v 1.3 2013/03/02 23:19:03 hwoarang Exp $
-
-EAPI=5
-
-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="CC-BY-SA-3.0 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- dev-qt/qtsql: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
-}
diff --git a/sci-electronics/fritzing/fritzing-0.7.12b.ebuild b/sci-electronics/fritzing/fritzing-0.7.12b.ebuild
deleted file mode 100644
index e184927758c1..000000000000
--- a/sci-electronics/fritzing/fritzing-0.7.12b.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.12b.ebuild,v 1.2 2013/04/15 18:04:27 idl0r Exp $
-
-EAPI=5
-
-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="CC-BY-SA-3.0 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- dev-qt/qtsql: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::' -e 's:-lminizip::' phoenix.pro || die
-
- 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
-}
-
-src_configure() {
- eqmake4 DEFINES=QUAZIP_INSTALLED phoenix.pro
-}
diff --git a/sci-electronics/fritzing/fritzing-0.8.3b.ebuild b/sci-electronics/fritzing/fritzing-0.8.7b.ebuild
index 836206f2c4dc..77676561f22e 100644
--- a/sci-electronics/fritzing/fritzing-0.8.3b.ebuild
+++ b/sci-electronics/fritzing/fritzing-0.8.7b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/fritzing/fritzing-0.8.3b.ebuild,v 1.1 2013/08/04 04:46:58 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/fritzing/fritzing-0.8.7b.ebuild,v 1.1 2014/02/05 01:16:30 mrueg Exp $
EAPI=5