* [gentoo-commits] repo/gentoo:master commit in: gnome-base/orbit/files/, gnome-base/orbit/, profiles/
@ 2020-12-10 12:55 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2020-12-10 12:55 UTC (permalink / raw
To: gentoo-commits
commit: a2c198e5867a49a19c87eeecb33b5cc91e637ef1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 12:50:32 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 12:50:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c198e5
gnome-base/orbit: Remove last-rited pkg
Closes: https://bugs.gentoo.org/751004
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
gnome-base/orbit/Manifest | 1 -
.../orbit/files/orbit-2.14.19-aix-func_data.patch | 99 --------------------
.../orbit/files/orbit-2.14.19-automake-1.13.patch | 22 -----
gnome-base/orbit/files/orbit-2.14.19-fPIC.patch | 46 ----------
.../orbit-2.14.19-link_protocol_is_local.patch | 29 ------
.../orbit/files/orbit-2.14.19-parallel-build.patch | 25 -----
gnome-base/orbit/metadata.xml | 12 ---
gnome-base/orbit/orbit-2.14.19-r5.ebuild | 102 ---------------------
profiles/package.mask | 1 -
9 files changed, 337 deletions(-)
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
deleted file mode 100644
index a3db461c992..00000000000
--- a/gnome-base/orbit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ORBit2-2.14.19.tar.bz2 764820 BLAKE2B 8b1180da6c5ae90e83edd330387da2974fd57d60fe79fa99b9f6f87fe7c4b9a816504c76fa055fef0c63cc72d3cccce3be410eb6945549ff30703ca26c8df631 SHA512 313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e
diff --git a/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch b/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch
deleted file mode 100644
index b58fd00a10b..00000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From c50f193f69f9b14dd26fafb7cb4c9514eaa6f15e Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
-Date: Thu, 26 Jun 2014 12:45:18 +0200
-Subject: [PATCH 1/2] bug#732275: rename func_data to gfunc_data for AIX
-
----
- include/orbit/orb-core/allocators.h | 2 +-
- src/idl-compiler/orbit-idl-utils.c | 14 +++++++-------
- src/idl-compiler/orbit-idl2.h | 4 ++--
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/include/orbit/orb-core/allocators.h b/include/orbit/orb-core/allocators.h
-index 0401a15..1861ca1 100644
---- a/include/orbit/orb-core/allocators.h
-+++ b/include/orbit/orb-core/allocators.h
-@@ -41,7 +41,7 @@ gpointer ORBit_realloc_tcval (gpointer old,
- Below, some magic values of the fnc ptr are defined.
- **/
- typedef gpointer (*ORBit_Mem_free_fn) (gpointer mem,
-- gpointer func_data);
-+ gpointer gfunc_data);
-
- #define ORBIT_MEMHOW_HOW(how) ((how) & 0x3)
- #define ORBIT_MEMHOW_ELEMENTS(how) ((how) >> 2)
-diff --git a/src/idl-compiler/orbit-idl-utils.c b/src/idl-compiler/orbit-idl-utils.c
-index 3bb0467..04fe4a2 100644
---- a/src/idl-compiler/orbit-idl-utils.c
-+++ b/src/idl-compiler/orbit-idl-utils.c
-@@ -362,7 +362,7 @@ orbit_idl_print_node(IDL_tree node, int indent_level)
-
- static void
- IDL_tree_traverse_helper(IDL_tree p, GFunc f,
-- gconstpointer func_data,
-+ gconstpointer gfunc_data,
- GHashTable *visited_nodes,
- gboolean include_self)
- {
-@@ -376,17 +376,17 @@ IDL_tree_traverse_helper(IDL_tree p, GFunc f,
- for (curitem = IDL_INTERFACE (p).inheritance_spec; curitem;
- curitem = IDL_LIST (curitem).next) {
- IDL_tree_traverse_helper (IDL_get_parent_node
-- (IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, func_data, visited_nodes, TRUE);
-+ (IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, gfunc_data, visited_nodes, TRUE);
- }
-
- if (include_self)
-- f(p, (gpointer)func_data);
-+ f(p, (gpointer)gfunc_data);
- }
-
- void
- IDL_tree_traverse_parents_full (IDL_tree p,
- GFunc f,
-- gconstpointer func_data,
-+ gconstpointer gfunc_data,
- gboolean include_self)
- {
- GHashTable *visited_nodes = g_hash_table_new (NULL, g_direct_equal);
-@@ -400,7 +400,7 @@ IDL_tree_traverse_parents_full (IDL_tree p,
- if (!p)
- return;
-
-- IDL_tree_traverse_helper (p, f, func_data, visited_nodes, include_self);
-+ IDL_tree_traverse_helper (p, f, gfunc_data, visited_nodes, include_self);
-
- g_hash_table_destroy (visited_nodes);
- }
-@@ -408,9 +408,9 @@ IDL_tree_traverse_parents_full (IDL_tree p,
- void
- IDL_tree_traverse_parents (IDL_tree p,
- GFunc f,
-- gconstpointer func_data)
-+ gconstpointer gfunc_data)
- {
-- IDL_tree_traverse_parents_full (p, f, func_data, TRUE);
-+ IDL_tree_traverse_parents_full (p, f, gfunc_data, TRUE);
- }
-
- /* For use by below function */
-diff --git a/src/idl-compiler/orbit-idl2.h b/src/idl-compiler/orbit-idl2.h
-index b58f57f..670e072 100644
---- a/src/idl-compiler/orbit-idl2.h
-+++ b/src/idl-compiler/orbit-idl2.h
-@@ -16,10 +16,10 @@ void orbit_idl_print_node (IDL_tree node,
- int indent_level);
- void IDL_tree_traverse_parents (IDL_tree p,
- GFunc f,
-- gconstpointer func_data);
-+ gconstpointer gfunc_data);
- void IDL_tree_traverse_parents_full (IDL_tree p,
- GFunc f,
-- gconstpointer func_data,
-+ gconstpointer gfunc_data,
- gboolean include_self);
- gboolean orbit_cbe_type_contains_complex (IDL_tree ts);
- void orbit_idl_check_oneway_op (IDL_tree op);
---
-1.8.3.2
-
diff --git a/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch b/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch
deleted file mode 100644
index fcfeefba08c..00000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- test/everything/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am
-index 32beb36..1eef7ac 100644
---- a/test/everything/Makefile.am
-+++ b/test/everything/Makefile.am
-@@ -73,12 +73,12 @@ server_DEPENDENCIES=${EVERYTHING_BUILT} $(included_src)
-
- IDL_FLAGS= --showcpperrors --add-imodule
- IDL_FILES= everything.idl
--include $(top_srcdir)/Makefile.shared
-+include ../../Makefile.shared
-
- BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c
- CLEANFILES = ${BUILT_SOURCES} iorfile
-
--TESTS = $(srcdir)/test.sh
-+TESTS = test.sh
-
- EXTRA_DIST = $(IDL_FILES) test.sh $(included_src)
-
diff --git a/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch b/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch
deleted file mode 100644
index 394919f9856..00000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 31236105deaa4b50a70aa256819bfc4790f705d8 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 3 Mar 2013 13:29:24 -0500
-Subject: [PATCH] Add an option to build libname-server-2.a's objects as PIC
-
-Needed for Gentoo hardened, see https://bugs.gentoo.org/show_bug.cgi?id=312161
----
- configure.in | 9 +++++++++
- src/services/name/Makefile.am | 1 +
- 2 files changed, 10 insertions(+)
-
-diff --git a/configure.in b/configure.in
-index 0879051..38b7b8b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -118,6 +118,15 @@ if test z$enable_purify = zyes; then
- AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled])
- fi
-
-+AC_ARG_ENABLE([libname-server-pic],
-+ [AS_HELP_STRING([--enable-libname-server-pic], [force libname-server-2.a to be built as PIC])])
-+if test x$enable_libname_server_pic = xyes; then
-+ LIBNAME_SERVER_PIC=$lt_prog_compiler_pic
-+else
-+ LIBNAME_SERVER_PIC=
-+fi
-+AC_SUBST(LIBNAME_SERVER_PIC)
-+
- AC_MSG_CHECKING(which idl compiler to use)
- IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"
- AC_ARG_WITH(idl-compiler,
-diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am
-index 7212557..21b7365 100644
---- a/src/services/name/Makefile.am
-+++ b/src/services/name/Makefile.am
-@@ -65,6 +65,7 @@ name_client_2_LDADD = $(LDADDS)
- libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \
- name-support.c name-support.h
- libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
-+libname_server_2_a_CFLAGS = $(INCLUDES) $(LIBNAME_SERVER_PIC)
-
- orbit_name_server_2_SOURCES = boot.c
- orbit_name_server_2_LDFLAGS = $(FLAGS)
---
-1.8.1.5
-
diff --git a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch b/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch
deleted file mode 100644
index 2344935f46d..00000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8b9acc9bd4ac9be12317f24c7ecafc4200e19609 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 12 Feb 2013 00:27:41 -0500
-Subject: [PATCH] Fix link_protocol_is_local_ipv46 for ipv4 on some
- ipv6-enabled machines
-
-Ensure that saddr is compared to an ipv4 local_addr, not to an ipv6 one,
-by setting hints.ai_family before calling getaddrinfo().
-
-https://bugzilla.gnome.org/show_bug.cgi?id=693636
----
- linc2/src/linc-protocols.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/linc2/src/linc-protocols.c b/linc2/src/linc-protocols.c
-index e6895f4..22a77aa 100644
---- a/linc2/src/linc-protocols.c
-+++ b/linc2/src/linc-protocols.c
-@@ -383,6 +383,7 @@ link_protocol_is_local_ipv46 (const LinkProtocolInfo *proto,
- memset(&hints, 0, sizeof(hints));
- hints.ai_socktype = SOCK_STREAM;
- hints.ai_flags = AI_CANONNAME;
-+ hints.ai_family = proto->family;
-
- if (getaddrinfo(link_get_local_hostname(), NULL, &hints, &local_addr) != 0) {
- if (!warned++)
---
-1.8.1.2
-
diff --git a/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch b/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch
deleted file mode 100644
index 113b90465ba..00000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c67303ecfdf80072a2852433c7f7818113e61c06 Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
-Date: Thu, 26 Jun 2014 12:37:59 +0200
-Subject: [PATCH 2/2] bug#732274: fix parallel build failure
-
----
- src/services/name/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am
-index deda1ed..8cf868e 100644
---- a/src/services/name/Makefile.am
-+++ b/src/services/name/Makefile.am
-@@ -68,7 +68,7 @@ libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
-
- orbit_name_server_2_SOURCES = boot.c
- orbit_name_server_2_LDFLAGS = $(FLAGS)
--orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h
-+orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h libname-server-2.a
- orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS)
-
- $(libname_server_2_a_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h
---
-1.8.3.2
-
diff --git a/gnome-base/orbit/metadata.xml b/gnome-base/orbit/metadata.xml
deleted file mode 100644
index 0d28a3e3264..00000000000
--- a/gnome-base/orbit/metadata.xml
+++ /dev/null
@@ -1,12 +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>
-<use>
- <flag name="pic">Force libname-server-2 to be built as PIC; needed on
- hardened systems</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/orbit/orbit-2.14.19-r5.ebuild b/gnome-base/orbit/orbit-2.14.19-r5.ebuild
deleted file mode 100644
index 989d5d6b26e..00000000000
--- a/gnome-base/orbit/orbit-2.14.19-r5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="ORBit2"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="ORBit2 is a high-performance CORBA ORB"
-HOMEPAGE="https://projects.gnome.org/ORBit2/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="pic static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( debug )"
-
-RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]
- >=dev-libs/libIDL-0.8.14-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/orbit-2.0/orbit/orbit-config.h )
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/orbit2-config )
-
-src_prepare() {
- # Fix wrong process kill, bug #268142
- sed "s:killall lt-timeout-server:killall timeout-server:" \
- -i test/timeout.sh || die "sed 1 failed"
-
- # Do not mess with CFLAGS
- sed 's/-ggdb -O0//' -i configure.in configure || die "sed 2 failed"
-
- if ! use test; then
- sed -i -e 's/test //' Makefile.am || die
- fi
-
- # Drop failing test, bug #331709
- sed -i -e 's/test-mem //' test/Makefile.am || die
-
- # Fix link_protocol_is_local() for ipv4 on machines with ipv6
- # https://bugzilla.gnome.org/show_bug.cgi?id=693636
- epatch "${FILESDIR}/${PN}-2.14.19-link_protocol_is_local.patch"
-
- # Build libname-server-2.a with -fPIC on hardened, bug #312161
- epatch "${FILESDIR}/${PN}-2.14.19-fPIC.patch"
-
- epatch "${FILESDIR}"/${P}-automake-1.13.patch
- epatch "${FILESDIR}"/${P}-parallel-build.patch #273031
- epatch "${FILESDIR}"/${P}-aix-func_data.patch #515094
-
- eautoreconf
- gnome2_src_prepare
-
- # we have to copy sources, there is something that causes tests
- # to segfault when libs are out-of-source built.
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf=()
-
- # We need to unset IDL_DIR, which is set by RSI's IDL. This causes certain
- # files to be not found by autotools when compiling ORBit. See bug #58540
- # for more information. Please don't remove -- 8/18/06
- unset IDL_DIR
-
- # We need to use the hosts IDL compiler if cross-compiling, bug #262741
- if tc-is-cross-compiler; then
- # check that host version is present and executable
- [[ -x ${EPREFIX}/usr/bin/orbit-idl-2 ]] || die "Please emerge ~${CATEGORY}/${P} on the host system first"
- myconf=("${myconf[@]}" "--with-idl-compiler=${EPREFIX}/usr/bin/orbit-idl-2")
- fi
- gnome2_src_configure \
- $(use_enable pic libname-server-pic) \
- $(use_enable static-libs static) \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- # Parallel compilation fails, bug #635094
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_test() {
- # can fail in parallel, see bug #235994
- emake -j1 check
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index b28d3d726b4..887c7bba779 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -488,7 +488,6 @@ games-rpg/twclone
# Deprecated GNOME2 era libraries with no reverse dependencies left.
# Removal in 30 days. Bug #751004.
gnome-base/libgnome-keyring
-gnome-base/orbit
# Thomas Deutschmann <whissi@gentoo.org> (2018-12-10)
# Marek Szuba <marecki@gentoo.org> (2020-10-13)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-10 12:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-10 12:55 [gentoo-commits] repo/gentoo:master commit in: gnome-base/orbit/files/, gnome-base/orbit/, profiles/ Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox