Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/gnome-disk-utility/, sys-apps/gnome-disk-utility/files/
Date: Tue, 31 May 2022 18:24:24
Message-Id: 1654021422.16ae784ee4221cc65d23271b51184f955be24d53.mattst88@gentoo
1 commit: 16ae784ee4221cc65d23271b51184f955be24d53
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 31 17:30:27 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue May 31 18:23:42 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ae784e
7
8 sys-apps/gnome-disk-utility: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 sys-apps/gnome-disk-utility/Manifest | 1 -
13 .../gnome-disk-utility-41.0-meson-0.61-build.patch | 28 ---------
14 .../gnome-disk-utility-41.0.ebuild | 67 ----------------------
15 3 files changed, 96 deletions(-)
16
17 diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
18 index 832bd084438a..2f58ee79e478 100644
19 --- a/sys-apps/gnome-disk-utility/Manifest
20 +++ b/sys-apps/gnome-disk-utility/Manifest
21 @@ -1,2 +1 @@
22 -DIST gnome-disk-utility-41.0.tar.xz 1401088 BLAKE2B 78769a714a8e5ee5596da3502562a7a136f54c7b832f44b8b70bae60de42af9dda433c4acd3b74ca31f71e53a633f2888c4e21d6ce9d9ccf2a03485903b3985f SHA512 a78dd281c078046abef5c0986777c6a87bc27d9b1bd6e798b5be058a3352b33dead8f5fea6e8f30e8c61bdd21996ee7d784838d953a33973243faabd7b713895
23 DIST gnome-disk-utility-42.0.tar.xz 1740332 BLAKE2B 4d05876364a475d1e16651569862fe3e9bb97549463146e69722c55922c0609069334e198eff91208448dc0baf7fcefe6bab56612e89fd7412fea42ba20549d2 SHA512 c47c37262295ba455b483a7ebe7799e92f94b97d177327817bb088cddcc3ff1f5840c3e270651287ff6a88257ec7cfcd1abe4167bf7454bbf55e145c8f1dc7c9
24
25 diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch
26 deleted file mode 100644
27 index c28b9002575e..000000000000
28 --- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch
29 +++ /dev/null
30 @@ -1,28 +0,0 @@
31 -https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/commit/46ed7d26873b9741dff61f9df8e7778a8dc6f5cc
32 -https://bugs.gentoo.org/831552
33 -
34 -From: rvalue <i@××××××.moe>
35 -Date: Fri, 17 Dec 2021 12:29:30 +0000
36 -Subject: [PATCH] build: fix arguments of i18n.merge_file
37 -
38 -`i18n.merge_file` has been ignoring positional arguments for a time
39 -and explicitly rejects with error since meson 0.60.0
40 ---- a/data/meson.build
41 -+++ b/data/meson.build
42 -@@ -11,7 +11,6 @@ desktops = [
43 -
44 - foreach desktop: desktops
45 - i18n.merge_file (
46 -- desktop,
47 - type: 'desktop',
48 - input: desktop + '.in',
49 - output: desktop,
50 -@@ -38,7 +37,6 @@ install_data(
51 - info = 'org.gnome.DiskUtility.appdata.xml'
52 -
53 - i18n.merge_file(
54 -- info,
55 - input: info + '.in',
56 - output: info,
57 - po_dir: po_dir,
58 -GitLab
59
60 diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
61 deleted file mode 100644
62 index e97b73b63ca4..000000000000
63 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
64 +++ /dev/null
65 @@ -1,67 +0,0 @@
66 -# Copyright 1999-2022 Gentoo Authors
67 -# Distributed under the terms of the GNU General Public License v2
68 -
69 -EAPI=7
70 -
71 -inherit gnome.org gnome2-utils meson xdg
72 -
73 -DESCRIPTION="Disk Utility for GNOME using udisks"
74 -HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
75 -
76 -LICENSE="GPL-2+"
77 -SLOT="0"
78 -IUSE="fat elogind gnome systemd"
79 -REQUIRED_USE="?? ( elogind systemd )"
80 -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
81 -
82 -DEPEND="
83 - >=media-libs/libdvdread-4.2.0:0=
84 - >=dev-libs/glib-2.31:2
85 - >=x11-libs/gtk+-3.16.0:3
86 - >=media-libs/libcanberra-0.1[gtk3]
87 - >=gui-libs/libhandy-1.1.90:1=
88 - >=app-arch/xz-utils-5.0.5
89 - >=x11-libs/libnotify-0.7:=
90 - >=app-crypt/libsecret-0.7
91 - >=dev-libs/libpwquality-1.0.0
92 - >=sys-fs/udisks-2.7.6:2
93 - elogind? ( >=sys-auth/elogind-209 )
94 - systemd? ( >=sys-apps/systemd-209:0= )
95 -"
96 -RDEPEND="${DEPEND}
97 - x11-themes/adwaita-icon-theme
98 - fat? ( sys-fs/dosfstools )
99 - gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
100 -"
101 -# libxml2 for xml-stripblanks in gresource
102 -BDEPEND="
103 - dev-libs/libxml2:2
104 - app-text/docbook-xsl-stylesheets
105 - dev-libs/libxslt
106 - dev-util/glib-utils
107 - >=sys-devel/gettext-0.19.8
108 - virtual/pkgconfig
109 -"
110 -
111 -PATCHES=(
112 - "${FILESDIR}"/${P}-meson-0.61-build.patch
113 -)
114 -
115 -src_configure() {
116 - local emesonargs=(
117 - -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
118 - $(meson_use gnome gsd_plugin)
119 - -Dman=true
120 - )
121 - meson_src_configure
122 -}
123 -
124 -pkg_postinst() {
125 - xdg_pkg_postinst
126 - gnome2_schemas_update
127 -}
128 -
129 -pkg_postrm() {
130 - xdg_pkg_postrm
131 - gnome2_schemas_update
132 -}