From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1324208-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 73F36158003
for <garchives@archives.gentoo.org>; Sat, 25 Sep 2021 15:59:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 630CBE0903;
Sat, 25 Sep 2021 15:59:13 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 460FDE0903
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 15:59:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E2D27342CEA
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 15:59:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 530BE2A
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 15:59:10 +0000 (UTC)
From: "Andreas K. Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" <dilfridge@gentoo.org>
Message-ID: <1632585531.ce969302196f7f415bcc683bca0d078024fec945.dilfridge@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/inkscape/inkscape-9999.ebuild
X-VCS-Directories: media-gfx/inkscape/
X-VCS-Committer: dilfridge
X-VCS-Committer-Name: Andreas K. Hüttel
X-VCS-Revision: ce969302196f7f415bcc683bca0d078024fec945
X-VCS-Branch: master
Date: Sat, 25 Sep 2021 15:59:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bbc72c65-44a5-43ab-9583-df1ec24d7013
X-Archives-Hash: c1bf721e9ba22d33ff0ceea15e746e56
commit: ce969302196f7f415bcc683bca0d078024fec945
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Jul 5 12:43:44 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 15:58:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce969302
media-gfx/inkscape: sync live
- Add optional readline support,
- gtkspell dependency was changed to gspell and aspell is not required
anymore,
- testing
Closes: https://bugs.gentoo.org/790269
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-gfx/inkscape/inkscape-9999.ebuild | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 6912d66bb36..dc4abef7db6 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS=""
IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
-openmp postscript spell static-libs svg2 visio wpg"
+openmp postscript readline spell static-libs svg2 test visio wpg"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -67,10 +67,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
jemalloc? ( dev-libs/jemalloc )
jpeg? ( virtual/jpeg:0 )
lcms? ( media-libs/lcms:2 )
- spell? (
- app-text/aspell
- app-text/gtkspell:3
- )
+ readline? ( sys-libs/readline:= )
+ spell? ( app-text/gspell )
visio? (
app-text/libwpg:0.3
dev-libs/librevenge
@@ -94,9 +92,10 @@ RDEPEND="${COMMON_DEPEND}
"
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.65
+ test? ( dev-cpp/gtest )
"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
S="${WORKDIR}/${MY_P}"
@@ -121,10 +120,13 @@ src_configure() {
-DENABLE_POPPLER=ON
-DENABLE_POPPLER_CAIRO=ON
-DWITH_PROFILING=OFF
+ -DBUILD_TESTING=$(usex test)
-DWITH_LIBCDR=$(usex cdr)
-DWITH_DBUS=$(usex dbus)
-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+ -DWITH_GNU_READLINE=$(usex readline)
+ -DWITH_GSPELL=$(usex spell)
-DWITH_JEMALLOC=$(usex jemalloc)
-DENABLE_LCMS=$(usex lcms)
-DWITH_OPENMP=$(usex openmp)
@@ -156,3 +158,7 @@ src_install() {
# Empty directory causes sandbox issues, see bug #761915
rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
}
+
+src_test() {
+ cmake_build -j1 check
+}