commit: 22074b9ca4b236ad9b65d0bf762cabd1d25b5b8a Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Oct 20 15:41:14 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Oct 20 15:52:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22074b9c
gnome-base/libgnome: Remove last-rited pkg Closes: https://bugs.gentoo.org/726784 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> gnome-base/libgnome/Manifest | 2 - .../libgnome/files/libgnome-2.26.0-branding.patch | 12 ---- .../files/libgnome-2.28.0-menus-have-icons.patch | 15 ----- .../files/libgnome-2.32.1-utf8-header.patch | 26 -------- gnome-base/libgnome/libgnome-2.32.1-r1.ebuild | 72 ---------------------- gnome-base/libgnome/metadata.xml | 8 --- profiles/package.deprecated | 1 - profiles/package.mask | 5 -- 8 files changed, 141 deletions(-) diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest deleted file mode 100644 index 92ce65449c7..00000000000 --- a/gnome-base/libgnome/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gentoo-gdm-theme-r3.tar.bz2 411703 BLAKE2B a4373d291f6813d2d07b78b23f5b5d1e288cb4a979a7b5cbe1351e6432cae2b24c07fa467b08c590a100e22807b3aa77ff085e0b8a9268e5542e81495013928a SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a -DIST libgnome-2.32.1.tar.bz2 1776006 BLAKE2B 3e9fa78bf1b9a550588374809c90f7cabd7fc3fe17f18d6e1ce0ea463bfb6999279d1e0cfb4d8df1c64571e6d8c6a9c90bbe558ba7cd8c99f2a100bf9fbf83d9 SHA512 f94e603255a93e73249e0fd9ed5604d732b44ad46f3cc3065afb46fc6162f6cf29304f49440b5c06303b8e68608b6fd16236076813febb5f1cbdcde4bfc3b3e3 diff --git a/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch b/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch deleted file mode 100644 index 2cab351e6b2..00000000000 --- a/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgnome-2.26.0.orig/schemas/desktop_gnome_background.schemas.in.in libgnome-2.26.0/schemas/desktop_gnome_background.schemas.in.in ---- libgnome-2.26.0.orig/schemas/desktop_gnome_background.schemas.in.in 2009-03-17 10:42:05.000000000 -0400 -+++ libgnome-2.26.0/schemas/desktop_gnome_background.schemas.in.in 2009-04-24 14:57:59.000000000 -0400 -@@ -29,7 +29,7 @@ - <applyto>/desktop/gnome/background/picture_filename</applyto> - <owner>gnome</owner> - <type>string</type> -- <default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default> -+ <default>@datadir@/pixmaps/backgrounds/gnome/gentoo/gentoo-emergence.png</default> - <locale name="C"> - <short>Picture Filename</short> - <long>File to use for the background image.</long> diff --git a/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch b/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch deleted file mode 100644 index 7249696a730..00000000000 --- a/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream changed default to no icons for menus. We don't want that. No one wants -that. - ---- ---- schemas/desktop_gnome_interface.schemas.in.in -+++ schemas/desktop_gnome_interface.schemas.in.in -@@ -65,7 +65,7 @@ - <applyto>/desktop/gnome/interface/menus_have_icons</applyto> - <owner>gnome</owner> - <type>bool</type> -- <default>false</default> -+ <default>true</default> - <locale name="C"> - <short>Menus Have Icons</short> - <long>Whether menus may display an icon next to a menu entry.</long> diff --git a/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch b/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch deleted file mode 100644 index a70dccc97e7..00000000000 --- a/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 33313713c4f5c1de500859ff128d6fd7e3af5722 Mon Sep 17 00:00:00 2001 -From: Colin Walters <[email protected]> -Date: Mon, 7 Aug 2017 12:57:43 -0400 -Subject: gnome-config.h: Fix invalid UTF-8 in header - -This breaks the new Python `glib-mkenums`. ---- - libgnome/gnome-config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgnome/gnome-config.h b/libgnome/gnome-config.h -index 0c3dfe6..b9d659d 100644 ---- a/libgnome/gnome-config.h -+++ b/libgnome/gnome-config.h -@@ -270,7 +270,7 @@ void gnome_config_clean_key_ (const char *path, gboolean priv); - #define gnome_config_private_clean_key(path) \ - (gnome_config_clean_key_((path),TRUE)) - --/* returns the true filename of the config file�*/ -+/* returns the true filename of the config file */ - #define gnome_config_get_real_path(path) \ - (g_build_filename (gnome_user_dir_get(),(path),NULL)) - #define gnome_config_private_get_real_path(path) \ --- -cgit v0.12 - diff --git a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild deleted file mode 100644 index 906503da428..00000000000 --- a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit gnome2 eutils - -DESCRIPTION="Essential Gnome Libraries" -HOMEPAGE="https://library.gnome.org/devel/libgnome/stable/"; - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="branding" - -SRC_URI="${SRC_URI} - branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )" - -RDEPEND=" - >=gnome-base/gconf-2 - >=dev-libs/glib-2.16:2 - >=gnome-base/gnome-vfs-2.5.3 - >=gnome-base/libbonobo-2.13 - >=dev-libs/popt-1.7 - media-libs/libcanberra -" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - virtual/pkgconfig -" - -PDEPEND="gnome-base/gvfs" - -src_prepare() { - # Make sure menus have icons. People don't like change - epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch" - - # Remove UTF-8 character from headers - # https://bugs.gentoo.org/639336 - epatch "${FILESDIR}"/${PN}-2.32.1-utf8-header.patch - - use branding && epatch "${FILESDIR}"/${PN}-2.26.0-branding.patch - - # Default to Adwaita theme over Clearlooks to proper gtk3 support - sed -i -e 's/Clearlooks/Adwaita/' schemas/desktop_gnome_interface.schemas.in.in || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --enable-canberra \ - --disable-esd -} - -src_install() { - gnome2_src_install - - if use branding; then - # Add gentoo backgrounds - dodir /usr/share/pixmaps/backgrounds/gnome/gentoo - insinto /usr/share/pixmaps/backgrounds/gnome/gentoo - doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png - doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png - fi -} diff --git a/gnome-base/libgnome/metadata.xml b/gnome-base/libgnome/metadata.xml deleted file mode 100644 index 39980802b1d..00000000000 --- a/gnome-base/libgnome/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/profiles/package.deprecated b/profiles/package.deprecated index 66c370e8678..44ef34b8569 100644 --- a/profiles/package.deprecated +++ b/profiles/package.deprecated @@ -54,7 +54,6 @@ dev-perl/Net-SMTP-SSL # Bugs #640022, #713010, #726784, #728956 gnome-base/gnome-vfs gnome-base/libbonobo -gnome-base/libgnome gnome-base/libgnome-keyring gnome-base/orbit diff --git a/profiles/package.mask b/profiles/package.mask index 8d4fc4ce614..8eeb97fd397 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -345,11 +345,6 @@ dev-python/cliapp dev-python/coverage-test-runner dev-python/ttystatus -# Michał Górny <[email protected]> (2020-09-20) -# Obsolete GNOME libraries. All remaining revdeps have been lastrited. -# Removal in 30 days. Bug #726784. -gnome-base/libgnome - # Michał Górny <[email protected]> (2020-09-09) # These packages (or package versions) still require Python 2.7. # They are either dead upstream, their Python 3 porting efforts are
