From c24a923be0a9211ac66a8719b4254a592987b6bb Mon Sep 17 00:00:00 2001 From: David Seifert Date: Thu, 22 Dec 2016 18:46:36 +0100 Subject: app-editors/juffed: Depend on x11-libs/qscintilla[qt4] Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3188 --- app-editors/juffed/juffed-0.10-r1.ebuild | 45 ++++++++++++++++++++++++++++++++ app-editors/juffed/juffed-0.10.ebuild | 45 -------------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 app-editors/juffed/juffed-0.10-r1.ebuild delete mode 100644 app-editors/juffed/juffed-0.10.ebuild (limited to 'app-editors/juffed') diff --git a/app-editors/juffed/juffed-0.10-r1.ebuild b/app-editors/juffed/juffed-0.10-r1.ebuild new file mode 100644 index 000000000000..6535a8ccd817 --- /dev/null +++ b/app-editors/juffed/juffed-0.10-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting" +HOMEPAGE="http://juffed.com/" +SRC_URI="mirror://sourceforge/${PN}/${P}-1054.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ~ppc64 x86" +IUSE="debug" + +RDEPEND=" + app-i18n/enca + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtsingleapplication[qt4(+),X] + x11-libs/qscintilla:=[qt4(-)] +" +DEPEND="${RDEPEND}" + +DOCS=( ChangeLog README ) + +PATCHES=( + # bug 540554 + "${FILESDIR}/0.10-link-libjuff-against-libenca.patch" +) + +src_prepare() { + cmake-utils_src_prepare + + sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON + ) + cmake-utils_src_configure +} diff --git a/app-editors/juffed/juffed-0.10.ebuild b/app-editors/juffed/juffed-0.10.ebuild deleted file mode 100644 index 068d98c47087..000000000000 --- a/app-editors/juffed/juffed-0.10.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting" -HOMEPAGE="http://juffed.com/" -SRC_URI="mirror://sourceforge/${PN}/${P}-1054.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="debug" - -RDEPEND=" - app-i18n/enca - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtsingleapplication[qt4(+),X] - x11-libs/qscintilla:= -" -DEPEND="${RDEPEND}" - -DOCS=( ChangeLog README ) - -PATCHES=( - # bug 540554 - "${FILESDIR}/0.10-link-libjuff-against-libenca.patch" -) - -src_prepare() { - cmake-utils_src_prepare - - sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON - ) - cmake-utils_src_configure -} -- cgit v1.2.3-65-gdbad