commit: a211c482c4cf7ece9d5c533bf586c133b9de8ce8 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Sep 20 19:22:08 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Sep 20 19:23:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a211c482
media-gfx/inkscape: Add 1.4beta3 (without keywords) Bug: https://bugs.gentoo.org/939907 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> media-gfx/inkscape/Manifest | 1 + .../{inkscape-9999.ebuild => inkscape-1.4_beta3.ebuild} | 12 ++++-------- media-gfx/inkscape/inkscape-9999.ebuild | 8 ++------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 53dccb520d73..92c5de657268 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1 +1,2 @@ DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343 +DIST inkscape-1.4beta3.tar.xz 46065140 BLAKE2B e24849462170014ee6ffd609e5f6db38694e387a5988929bc52cf3b9594d0021c63d8bdfe997dc22f6c544e1c65b9ccd78f314cb943242a860471122d32efcd8 SHA512 3c8d757eacef54742c4c8b9ce923719fee4ae1fb6d39031fecdf4d9641cfaa2e689adcfa16a7450a43aefe5795a2319f0ef5cd7304e78b2a9bff0da02106faba diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-1.4_beta3.ebuild similarity index 92% copy from media-gfx/inkscape/inkscape-9999.ebuild copy to media-gfx/inkscape/inkscape-1.4_beta3.ebuild index ea0ae58a644c..965b6faf3353 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-1.4_beta3.ebuild @@ -16,8 +16,8 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"; else - SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz"; + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi S="${WORKDIR}/${MY_P}" @@ -38,7 +38,7 @@ BDEPEND=" COMMON_DEPEND="${PYTHON_DEPS} >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 - >=dev-cpp/glibmm-2.54.1:2 + >=dev-cpp/glibmm-2.58:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= @@ -55,7 +55,6 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= - net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] @@ -124,7 +123,7 @@ src_unpack() { else default fi - [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die } src_prepare() { @@ -198,7 +197,4 @@ src_install() { python_fix_shebang "${ED}"/usr/share/${PN}/extensions python_optimize "${ED}"/usr/share/${PN}/extensions fi - - # Empty directory causes sandbox issues, see bug #761915 - rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." } diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index ea0ae58a644c..7871706cb2a5 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -38,7 +38,7 @@ BDEPEND=" COMMON_DEPEND="${PYTHON_DEPS} >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 - >=dev-cpp/glibmm-2.54.1:2 + >=dev-cpp/glibmm-2.58:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= @@ -55,7 +55,6 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= - net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] @@ -124,7 +123,7 @@ src_unpack() { else default fi - [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die } src_prepare() { @@ -198,7 +197,4 @@ src_install() { python_fix_shebang "${ED}"/usr/share/${PN}/extensions python_optimize "${ED}"/usr/share/${PN}/extensions fi - - # Empty directory causes sandbox issues, see bug #761915 - rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." }
