aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2019-02-23 22:05:54 +0200
committerMart Raudsepp <leio@gentoo.org>2019-02-23 22:05:54 +0200
commit9a54f9aedc9c3ab3bdce7ba7780d9d1102fd85fd (patch)
tree39f05e8f20e7c9afea56b3dcb195892b296fb216
parentgnome-base/gnome: remove, available in ::gentoo (diff)
downloadgnome-9a54f9aedc9c3ab3bdce7ba7780d9d1102fd85fd.tar.gz
gnome-9a54f9aedc9c3ab3bdce7ba7780d9d1102fd85fd.tar.bz2
gnome-9a54f9aedc9c3ab3bdce7ba7780d9d1102fd85fd.zip
gnome-base/gnome-desktop: remove, available in ::gentoo
Main tree version has additional ebuild and upstream fixes in the 3.26 versions, but now also has 3.30 available. 9999 here is too outdated and upstream moved 3.31 over to meson. Signed-off-by: Mart Raudsepp <leio@gentoo.org>
-rw-r--r--gnome-base/gnome-desktop/Manifest23
-rw-r--r--gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch12
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild64
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild61
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-9999.ebuild112
-rw-r--r--gnome-base/gnome-desktop/metadata.xml8
6 files changed, 0 insertions, 280 deletions
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
deleted file mode 100644
index 8c9febc8..00000000
--- a/gnome-base/gnome-desktop/Manifest
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST gnome-desktop-3.26.2.tar.xz 969500 BLAKE2B fb1e671d8fb890d9aabbd351b824b76f13ed7ba62dd3f82a36fca7cbe590af8901fc7bd8ef1be6a5c9b978569b306eba5c3d2f9545856389438a43539b1ed9e4 SHA512 1425bead81a63d9d19f09fb8d23cd2611645898a910887c2b6a672bfbec3dd956e29e1d8c5f941d06929febc7734dec0550f7a15336583fcf9be41f1a4e9c783
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQKTBAEBCAB9FiEEX+aBqe7MmoWBwzA1lSmjXZiBxnkFAluWgidfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDVG
-RTY4MUE5RUVDQzlBODU4MUMzMzAzNTk1MjlBMzVEOTg4MUM2NzkACgkQlSmjXZiB
-xnn2yg/+JQFA9bNyiGJ84CPMJQglYoEn3sEwv7ZwbTMjCnlRtzw+04VpU9O5uz0h
-NMzcvMU7dL0J3nt24mdT1eg2wNNQw7iZ9g+TRXGkCnLw8FQ8rZucFU2Yo9eM55zL
-Kan9lfYk7dhgVfaMlkyCED7al5VssI3kei/TO1gGESf9kSuKy7lbr32nyhhMiwY2
-O5EsuvTe2+r8wxKQ40j0NwFdWceGpXKgBOue7BNle3W8PAOe4WcWYTIpiwlTBPDR
-+yO78RpPGM1fbBslbWL7Xmt+gCRn1wGGMjTljkxpFWr7IjT87JpdBGffqrdwtj5T
-Uv7AVYtwTgUw/fbjSEPIguJNzsV/rzKUWS4NgWBR09QWhlIPzY2Z9viIkS/eGRz8
-5h3MMf0dftQCTzZc37cWvmZRWsMx493hUHFQif9MXsWThK32Ilfp4RB49W8eop8R
-waem1p4vS8JWOal5lR6cfCfLXbyYrWlR5aixc7ztwM49rzqLPH6soAv8n1nsQaPc
-HmD0/Y1MT1v0SSWnp+6I1yBdV/LM6XsHLivGuVUjZZxJMi3/AKxT6vFpcB7QjgYV
-C5fsbkIP8XJw5LcE1Uu+qZEfkd7hZiQ4PLw771FSAWhvMdFY02fNWWCVA2GhGCeb
-k4u4hSV6ns0pEk1Ih0CwJ0v1LtTdBSZbp7UqhE3yzUiYMX25Egg=
-=3okk
------END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch b/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch
deleted file mode 100644
index ac81e1c7..00000000
--- a/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-index 99d83ac..72f4459 100644
---- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
-+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -508,6 +508,7 @@ add_bwrap (GPtrArray *array,
- "--ro-bind", "/usr", "/usr",
- "--ro-bind", "/lib", "/lib",
- "--ro-bind", "/lib64", "/lib64",
-+ "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
- "--proc", "/proc",
- "--dev", "/dev",
- "--symlink", "usr/bin", "/bin",
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild
deleted file mode 100644
index 93c9caee..00000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/12" # subslot = libgnome-desktop-3 soname version
-IUSE="debug +introspection seccomp udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-# automagic dependency on seccomp
-COMMON_DEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.53.0:2[dbus]
- >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
- >=x11-libs/gtk+-3.3.6:3[X,introspection?]
- x11-libs/cairo:=[X]
- x11-libs/libX11
- x11-misc/xkeyboard-config
- >=gnome-base/gsettings-desktop-schemas-3.5.91
- introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
- seccomp? ( sys-libs/libseccomp )
- udev? (
- sys-apps/hwids
- virtual/libudev:= )
-"
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gdbus-codegen
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.6
- dev-util/itstool
- sys-devel/gettext
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-
-PATCHES=(
- "${FILESDIR}"/${PV}-load-ld-so-cache.patch
-)
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --with-gnome-distributor=Gentoo \
- --enable-desktop-docs \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable debug debug-tools) \
- $(use_enable introspection) \
- $(use_enable udev)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
deleted file mode 100644
index 87f30f65..00000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/12" # subslot = libgnome-desktop-3 soname version
-IUSE="debug +introspection seccomp udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-# automagic dependency on seccomp
-COMMON_DEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.53.0:2[dbus]
- >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
- >=x11-libs/gtk+-3.3.6:3[X,introspection?]
- x11-libs/cairo:=[X]
- x11-libs/libX11
- x11-misc/xkeyboard-config
- >=gnome-base/gsettings-desktop-schemas-3.5.91
- introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
- seccomp? ( sys-libs/libseccomp )
- udev? (
- sys-apps/hwids
- virtual/libudev:= )
-"
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gdbus-codegen
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.6
- dev-util/itstool
- sys-devel/gettext
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --with-gnome-distributor=Gentoo \
- --enable-desktop-docs \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable debug debug-tools) \
- $(use_enable introspection) \
- $(use_enable udev)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
deleted file mode 100644
index 820f6c12..00000000
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit git-2 gnome2-live
-fi
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/12" # subslot = libgnome-desktop-3 soname version
-IUSE="+introspection"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-# cairo[X] needed for gnome-bg
-COMMON_DEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.44.0:2[dbus]
- >=x11-libs/gdk-pixbuf-2.33.0:2[introspection?]
- >=x11-libs/gtk+-3.3.6:3[X,introspection?]
- >=x11-libs/libXext-1.1
- >=x11-libs/libXrandr-1.3
- x11-libs/cairo:=[X]
- x11-libs/libX11
- x11-misc/xkeyboard-config
- >=gnome-base/gsettings-desktop-schemas-3.5.91
- introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gdbus-codegen
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.6
- dev-util/itstool
- sys-devel/gettext
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? ( >=dev-util/gtk-doc-1.4 )
- app-text/yelp-tools"
-fi
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-src_unpack() {
- gnome2_src_unpack
-
- if [[ ${PV} = 9999 ]]; then
- # pnp.ids are only provided with the gnome-desktop tarball;
- # for the live version, we have to get them from hwdata git
- unset gnome_desktop_LIVE_BRANCH
- unset gnome_destkop_LIVE_COMMIT
- unset gnome_desktop_LIVE_REPO
- unset EGIT_BRANCH
- unset EGIT_COMMIT
- unset EGIT_DIR
- unset EGIT_MASTER
- EGIT_PROJECT="gnome-desktop_hwdata"
- EGIT_REPO_URI="git://git.fedorahosted.org/hwdata.git"
- EGIT_SOURCEDIR="${WORKDIR}/hwdata"
- git-2_src_unpack
- ln -sf "${WORKDIR}/hwdata/pnp.ids" "${S}/libgnome-desktop/" ||
- die "ln -sf failed"
- fi
-}
-
-src_configure() {
- local myconf=""
-
- if [[ ${PV} = 9999 ]]; then
- myconf="${myconf} $(use_enable doc gtk-doc)"
- else
- myconf="${myconf} ITSTOOL=$(type -P true)"
- fi
-
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
- # Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
- # file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
- # will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
- gnome2_src_configure \
- --disable-debug-tools \
- --disable-static \
- --with-gnome-distributor=Gentoo \
- --enable-desktop-docs \
- $(use_enable introspection) \
- ${myconf}
-}
-
-src_test() {
- # Makes unittest fail without this locale installed
- rm "${S}"/tests/he_IL* || die
-
- Xemake check
-}
diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
deleted file mode 100644
index 996e7cac..00000000
--- a/gnome-base/gnome-desktop/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>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
-</pkgmetadata>