summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/diffoscope/Manifest1
-rw-r--r--dev-util/diffoscope/diffoscope-153.ebuild71
-rw-r--r--dev-util/dwarves/dwarves-1.17.ebuild2
-rw-r--r--dev-util/glade/Manifest1
-rw-r--r--dev-util/glade/files/glade-doc-version.patch29
-rw-r--r--dev-util/glade/files/glade-python.patch12
-rw-r--r--dev-util/glade/glade-3.37.0-r1.ebuild (renamed from dev-util/glade/glade-3.36.0.ebuild)46
7 files changed, 62 insertions, 100 deletions
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 566e8359a0ac..a1884f8b0e7f 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,2 +1 @@
-DIST diffoscope-153.tar.gz 1571168 BLAKE2B 3fea8884d733b947c629f2797c2f3f27e41233494e4e930bf4913f444d5dbd815478f7acd7f714e30ec711c23a7cfe41191e4edee0e08edbd583953397a4d9de SHA512 500f866cfd0d0a5adfff3d98be68fa4d52c1f438668b5dbd30f40913523de069e7b53bfae3ece854b22e4860c56e4359240e92419b3b2a7a1981dac9358a3876
DIST diffoscope-154.tar.gz 1571220 BLAKE2B 84b7a282180b4f8d3b374dac8e3514b3bb7d3fda3b40db757dad98e011112174da27a35243bd9b23f2b905ea59dc8c9a85d9cef6d436d9c705ca57b379dfb7b4 SHA512 f3a21deb9542c7ec7fc9929685d57ef97739d86f8e5227e212aaf3984a53df88f3224b2f4ba6254fde76f1858cbae83fea138e3c914a47625a62c6e6607ed28f
diff --git a/dev-util/diffoscope/diffoscope-153.ebuild b/dev-util/diffoscope/diffoscope-153.ebuild
deleted file mode 100644
index 89af8c5865e2..000000000000
--- a/dev-util/diffoscope/diffoscope-153.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
- dev-python/libarchive-c[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- acl? ( sys-apps/acl )
- binutils? ( sys-devel/binutils )
- bzip2? ( app-arch/bzip2 )
- libcaca? ( media-libs/libcaca )
- colord? ( x11-misc/colord )
- cpio? ( app-arch/cpio )
- diff? ( sys-apps/diffutils )
- docx? ( app-text/docx2txt )
- dtc? ( sys-apps/dtc )
- e2fsprogs? ( sys-fs/e2fsprogs )
- file? ( sys-apps/file )
- find? ( sys-apps/findutils )
- gettext? ( sys-devel/gettext )
- gif? ( media-libs/giflib )
- gpg? ( app-crypt/gnupg )
- gzip? ( app-arch/gzip )
- haskell? ( dev-lang/ghc )
- hdf5? ( sci-libs/hdf5 )
- hex? ( app-editors/vim-core )
- imagemagick? ( media-gfx/imagemagick )
- iso? ( virtual/cdrtools )
- java? ( virtual/jdk )
- llvm? ( sys-devel/llvm )
- mono? ( dev-lang/mono )
- opendocument? ( app-text/odt2txt )
- pascal? ( dev-lang/fpc )
- pdf? (
- app-text/pdftk
- app-text/poppler
- dev-python/PyPDF2[${PYTHON_USEDEP}]
- )
- postscript? ( app-text/ghostscript-gpl )
- R? ( dev-lang/R )
- rpm? ( app-arch/rpm )
- sqlite? ( dev-db/sqlite:3 )
- squashfs? ( sys-fs/squashfs-tools )
- ssh? ( net-misc/openssh )
- tar? ( app-arch/tar )
- tcpdump? ( net-analyzer/tcpdump )
- xz? ( app-arch/xz-utils )
- zip? ( app-arch/unzip )
- zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/dwarves/dwarves-1.17.ebuild b/dev-util/dwarves/dwarves-1.17.ebuild
index 7f36aec4f618..bffa87b70aa7 100644
--- a/dev-util/dwarves/dwarves-1.17.ebuild
+++ b/dev-util/dwarves/dwarves-1.17.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
LICENSE="GPL-2" # only
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 70cd51c74aff..69d07e1ee2fb 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,2 +1 @@
-DIST glade-3.36.0.tar.xz 4466808 BLAKE2B ebc93c9471225782bcbcbafc4a475638e77ad763d607188d95e8ac77b3de70f76fefe963027bb6b32ae71adeb1daafdb1a2c98363b25030d83f20f767613f68e SHA512 c984613ade26e3fe68a700a48cccadf5ac96eb716a6e90aad36f3de684faeb607d9aaf112d74a048cd33e222a02388ee6583ca915648486f0259cc805e16d243
DIST glade-3.37.0.tar.xz 2650520 BLAKE2B 16c126a67b63b79e40153c98cd06bc813820470ab1c6876147a8dbf8f230146b806901a1bac61d8668894f47ec00dd004619a7228277b72404c26cc21633f2d6 SHA512 eafa7fef3132fd95f3a40d8200a11716e106052d029d3c3f05133138b50085a8f6548d93d2a37d2f60a575e6b629d500c02408979507fbd04334dd5181a46e85
diff --git a/dev-util/glade/files/glade-doc-version.patch b/dev-util/glade/files/glade-doc-version.patch
new file mode 100644
index 000000000000..39c9641719a4
--- /dev/null
+++ b/dev-util/glade/files/glade-doc-version.patch
@@ -0,0 +1,29 @@
+From e3e91245e730f0532e913fde910054f464085241 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 6 May 2012 22:40:47 -0400
+Subject: [PATCH] Version glade documentation
+
+Rename gnome help files to prevent collision with other versions.
+
+Avoid loading glade-3.8's devhelp files.
+---
+ help/Makefile.am | 5 ++++-
+ src/glade-window.c | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/glade-window.c b/src/glade-window.c
+index 89a4549..4eb8be5 100644
+--- a/src/glade-window.c
++++ b/src/glade-window.c
+@@ -2041,7 +2041,7 @@ show_developer_manual_cb (GtkAction * action, GladeWindow * window)
+ {
+ if (glade_util_have_devhelp ())
+ {
+- glade_util_search_devhelp ("gladeui", NULL, NULL);
++ glade_util_search_devhelp ("gladeui-2", NULL, NULL);
+ return;
+ }
+
+--
+1.7.8.6
+
diff --git a/dev-util/glade/files/glade-python.patch b/dev-util/glade/files/glade-python.patch
new file mode 100644
index 000000000000..689a57064f5e
--- /dev/null
+++ b/dev-util/glade/files/glade-python.patch
@@ -0,0 +1,12 @@
+diff -urN glade-3.37.0.orig/meson.build glade-3.37.0/meson.build
+--- glade-3.37.0.orig/meson.build 2020-08-01 17:37:59.782813027 +0200
++++ glade-3.37.0/meson.build 2020-08-01 17:39:17.546816900 +0200
+@@ -150,7 +150,7 @@
+ pygobject_dep = dependency('pygobject-3.0', version: '>= ' + pygobject_version, required: get_option('python'))
+ have_python = pygobject_dep.found()
+ if have_python
+- python_dep = dependency('python-3.8-embed', version: '>= 3.8')
++ python_dep = dependency('python3-embed', version: '>= 3.8')
+
+ version_array = pygobject_version.split('.')
+ config_h.set('PYGOBJECT_REQUIRED_MAJOR', version_array[0].to_int())
diff --git a/dev-util/glade/glade-3.36.0.ebuild b/dev-util/glade/glade-3.37.0-r1.ebuild
index 3af746bb93db..859d5ea8041b 100644
--- a/dev-util/glade/glade-3.36.0.ebuild
+++ b/dev-util/glade/glade-3.37.0-r1.ebuild
@@ -4,7 +4,7 @@ EAPI=6
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-inherit gnome2 python-single-r1 virtualx
+inherit gnome2 meson python-single-r1 virtualx
DESCRIPTION="A user interface designer for GTK+ and GNOME"
HOMEPAGE="https://glade.gnome.org/"
@@ -13,16 +13,17 @@ LICENSE="GPL-2+ FDL-1.1+"
SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="debug +introspection python webkit"
+IUSE="debug gjs gladeui gtk_doc +introspection man python webkit"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
dev-libs/atk[introspection?]
>=dev-libs/glib-2.53.2:2
- >=dev-libs/libxml2-2.4.0:2
+ gjs? ( dev-libs/gjs )
+ >=dev-libs/libxml2-2.4.1:2
x11-libs/cairo:=
x11-libs/gdk-pixbuf:2[introspection?]
- >=x11-libs/gtk+-3.20.0:3[introspection?]
+ >=x11-libs/gtk+-3.24.0:3[introspection?]
x11-libs/pango[introspection?]
introspection? ( >=dev-libs/gobject-introspection-1.32:= )
python? (
@@ -32,7 +33,7 @@ RDEPEND="
>=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
')
)
- webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
+ webkit? ( >=net-libs/webkit-gtk-2.28.0:4 )
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.1.2
@@ -48,7 +49,8 @@ RESTRICT="test"
PATCHES=(
# To avoid file collison with other slots, rename help module.
# Prevent the UI from loading glade:3's gladeui devhelp documentation.
- "${FILESDIR}"/${PN}-3.14.1-doc-version.patch
+ "${FILESDIR}/${PN}-doc-version.patch"
+ "${FILESDIR}/${PN}-python.patch"
)
pkg_setup() {
@@ -56,14 +58,17 @@ pkg_setup() {
}
src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-gladeui \
- --enable-libtool-lock \
- $(usex debug --enable-debug ' ') \
- $(use_enable introspection) \
- $(use_enable python) \
- $(use_enable webkit webkit2gtk)
+ local mesonargs=(
+ $(meson_use gladeui)
+ $(meson_use gjs)
+ $(meson_use gtk_doc)
+ $(meson_use debug)
+ $(meson_use introspection)
+ $(meson_use man)
+ $(meson_use python)
+ $(meson_use webkit webkit2gtk)
+ )
+ meson_src_configure
}
src_test() {
@@ -71,16 +76,5 @@ src_test() {
}
src_install() {
- # modify name in .devhelp2 file to avoid shadowing with glade:3 docs
- sed -e 's:name="gladeui":name="gladeui-2":' \
- -i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
- gnome2_src_install
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if ! has_version dev-util/devhelp ; then
- elog "You may want to install dev-util/devhelp for integration API"
- elog "documentation support."
- fi
+ meson_src_install
}
generated by cgit v1.3 (git 2.53.0) at 2026-10-15 08:33:34 +0000