From 0ea518f906725449076820e7bb6872b04ba9b599 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Mon, 15 Feb 2021 03:57:07 +0000
Subject: sci-electronics/fritzing: fix quazip slot dep

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam@gentoo.org>
---
 sci-electronics/fritzing/fritzing-0.9.4-r1.ebuild | 81 +++++++++++++++++++++++
 sci-electronics/fritzing/fritzing-0.9.4.ebuild    | 81 -----------------------
 2 files changed, 81 insertions(+), 81 deletions(-)
 create mode 100644 sci-electronics/fritzing/fritzing-0.9.4-r1.ebuild
 delete mode 100644 sci-electronics/fritzing/fritzing-0.9.4.ebuild

(limited to 'sci-electronics')

diff --git a/sci-electronics/fritzing/fritzing-0.9.4-r1.ebuild b/sci-electronics/fritzing/fritzing-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..09faeeae4604
--- /dev/null
+++ b/sci-electronics/fritzing/fritzing-0.9.4-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+MY_PV="CD-498"
+PARTS_P="${PN}-parts-${PV}"
+PARTS_COMMIT="e79a69765026f3fda8aab1b3e7a4952c28047a62"
+
+DESCRIPTION="Electronic Design Automation"
+HOMEPAGE="https://fritzing.org/
+	https://github.com/fritzing/fritzing-app/"
+SRC_URI="https://github.com/fritzing/fritzing-app/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/fritzing/fritzing-parts/archive/${PARTS_COMMIT}.tar.gz -> ${PARTS_P}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtserialport:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-libs/quazip:0
+	dev-libs/libgit2:=
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+
+S="${WORKDIR}/${PN}-app-${MY_PV}"
+
+DOCS=( "README.md" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-libgit2-version.patch"
+	"${FILESDIR}/${P}-move-parts-db-path.patch"
+)
+
+src_prepare() {
+	# fix build with newer quazip - bug #597988
+	sed -i -e "s/#include <quazip/&5/" src/utils/folderutils.cpp || die
+	sed -i -e "s|/usr/include/quazip|&5|" -e "s/-lquazip/&5/" phoenix.pro || die
+
+	# Get a rid of the bundled libs
+	# Bug 412555 and
+	# https://code.google.com/p/fritzing/issues/detail?id=1898
+	rm -r src/lib/quazip/ pri/quazip.pri || die
+
+	# Fritzing doesn't need zlib
+	sed -i -e 's:LIBS += -lz::' -e 's:-lminizip::' phoenix.pro || die
+
+	# Use system libgit
+	sed -i -e 's:LIBGIT_STATIC.*:LIBGIT_STATIC = false:' phoenix.pro || die
+
+	# Add correct git version
+	sed -i -e "s:GIT_VERSION = \$\$system.*$:GIT_VERSION = ${MY_PV}:" pri/gitversion.pri || die
+
+	default
+}
+
+src_configure() {
+	eqmake5 'DEFINES=QUAZIP_INSTALLED PARTS_COMMIT=\\\"'"${PARTS_COMMIT}"'\\\"' phoenix.pro
+}
+
+src_install() {
+	PARTS_DIR="${WORKDIR}/fritzing-parts-${PARTS_COMMIT}"
+	INSTALL_ROOT="${D}" default
+	insinto /usr/share/fritzing/fritzing-parts
+	doins -r ${PARTS_DIR}/*
+}
diff --git a/sci-electronics/fritzing/fritzing-0.9.4.ebuild b/sci-electronics/fritzing/fritzing-0.9.4.ebuild
deleted file mode 100644
index 4d76ed86245b..000000000000
--- a/sci-electronics/fritzing/fritzing-0.9.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-MY_PV="CD-498"
-PARTS_P="${PN}-parts-${PV}"
-PARTS_COMMIT="e79a69765026f3fda8aab1b3e7a4952c28047a62"
-
-DESCRIPTION="Electronic Design Automation"
-HOMEPAGE="https://fritzing.org/
-	https://github.com/fritzing/fritzing-app/"
-SRC_URI="https://github.com/fritzing/fritzing-app/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/fritzing/fritzing-parts/archive/${PARTS_COMMIT}.tar.gz -> ${PARTS_P}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0 GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-libs/quazip
-	dev-libs/libgit2:=
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost
-"
-
-S="${WORKDIR}/${PN}-app-${MY_PV}"
-
-DOCS=( "README.md" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-libgit2-version.patch"
-	"${FILESDIR}/${P}-move-parts-db-path.patch"
-)
-
-src_prepare() {
-	# fix build with newer quazip - bug #597988
-	sed -i -e "s/#include <quazip/&5/" src/utils/folderutils.cpp || die
-	sed -i -e "s|/usr/include/quazip|&5|" -e "s/-lquazip/&5/" phoenix.pro || die
-
-	# Get a rid of the bundled libs
-	# Bug 412555 and
-	# https://code.google.com/p/fritzing/issues/detail?id=1898
-	rm -r src/lib/quazip/ pri/quazip.pri || die
-
-	# Fritzing doesn't need zlib
-	sed -i -e 's:LIBS += -lz::' -e 's:-lminizip::' phoenix.pro || die
-
-	# Use system libgit
-	sed -i -e 's:LIBGIT_STATIC.*:LIBGIT_STATIC = false:' phoenix.pro || die
-
-	# Add correct git version
-	sed -i -e "s:GIT_VERSION = \$\$system.*$:GIT_VERSION = ${MY_PV}:" pri/gitversion.pri || die
-
-	default
-}
-
-src_configure() {
-	eqmake5 'DEFINES=QUAZIP_INSTALLED PARTS_COMMIT=\\\"'"${PARTS_COMMIT}"'\\\"' phoenix.pro
-}
-
-src_install() {
-	PARTS_DIR="${WORKDIR}/fritzing-parts-${PARTS_COMMIT}"
-	INSTALL_ROOT="${D}" default
-	insinto /usr/share/fritzing/fritzing-parts
-	doins -r ${PARTS_DIR}/*
-}
-- 
cgit v1.2.3-65-gdbad