From 4bb5ba021a4a2cc46efb588b83695bdd5d59be6f Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Fri, 21 Dec 2018 08:16:44 +0100 Subject: app-admin/packagekit-base: cleanup 1.1.7 Refs: https://bugs.gentoo.org/653068 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Gilles Dartiguelongue --- app-admin/packagekit-base/Manifest | 1 - .../files/packagekit-base-1.1.1-cache-qafix.patch | 15 -- .../packagekit-base-1.1.7-elogind-support.patch | 184 --------------------- .../packagekit-base-1.1.7-r2.ebuild | 130 --------------- 4 files changed, 330 deletions(-) delete mode 100644 app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch delete mode 100644 app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch delete mode 100644 app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest index f6a175783815..5dfab8144477 100644 --- a/app-admin/packagekit-base/Manifest +++ b/app-admin/packagekit-base/Manifest @@ -1,2 +1 @@ DIST PackageKit-1.1.12.tar.xz 1439024 BLAKE2B 458cb7a9a47941214ec58846fb840f852851555dbd94ed5113745f9e375cd28edaa8475db30fb889b1722ea01bce5200a5ea7a5f52e45b424703228bff59d689 SHA512 a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b -DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83 diff --git a/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch b/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch deleted file mode 100644 index d7ec4b268c84..000000000000 --- a/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/~Makefile.am 2016-06-29 10:59:14.178918032 +0200 -+++ b/src/Makefile.am 2016-06-29 11:02:50.739929627 +0200 -@@ -175,11 +175,7 @@ pk_self_test_CFLAGS = \ - TESTS = pk-self-test - - install-data-hook: -- if test -w $(DESTDIR)$(prefix)/; then \ -- mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/downloads; \ -- mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/metadata; \ -- mkdir -p $(DESTDIR)$(localstatedir)/log; \ -- fi -+ - - clean-local: - rm -f *~ diff --git a/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch b/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch deleted file mode 100644 index bb6b6103dde2..000000000000 --- a/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch +++ /dev/null @@ -1,184 +0,0 @@ ---- a/config.h.in 2017-06-07 16:38:45.046910693 +0200 -+++ b/config.h.in 2017-06-07 16:39:06.973911120 +0200 -@@ -78,8 +78,8 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_STRING_H - --/* Build systemd code */ --#undef HAVE_SYSTEMD -+/* Build systemd-login code */ -+#undef HAVE_SYSTEMD_SD_LOGIN_H - - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_STAT_H ---- a/configure.ac 2017-06-06 09:03:57.171355965 +0200 -+++ b/configure.ac 2017-06-06 09:55:11.242384458 +0200 -@@ -254,7 +254,6 @@ - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [has_systemdsystemunitdir=$with_systemdsystemunitdir], - [has_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -- AC_DEFINE(HAVE_SYSTEMD,1,[Build systemd code]) - AC_SUBST([systemdsystemunitdir], [$has_systemdsystemunitdir]) - fi - AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$has_systemdsystemunitdir"]) -@@ -267,6 +266,24 @@ - AM_CONDITIONAL(ENABLE_OFFLINE_UPDATE, [test x$enable_systemd = xyes -a x$enable_offline_update = xyes]) - - dnl --------------------------------------------------------------------------- -+dnl - Use elogind instead of systemd-login -+dnl --------------------------------------------------------------------------- -+AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[enable elogind session tracker]), -+ enable_elogind=$enableval,enable_elogind=no) -+if test x$enable_elogind = xyes; then -+ PKG_CHECK_MODULES(ELOGIND, [libelogind >= 229.4], [have_elogind=yes], [have_elogind=no]) -+else -+ have_elogind=no -+fi -+ -+dnl --------------------------------------------------------------------------- -+dnl --- Is systemd/sd-login.h, either from systemd or elogind, available? -+dnl --------------------------------------------------------------------------- -+if test -n "$has_systemdsystemunitdir" -o "x$have_elogind" != "xno" ; then -+ AC_DEFINE(HAVE_SYSTEMD_SD_LOGIN_H,1,[Build systemd-login code]) -+fi -+ -+dnl --------------------------------------------------------------------------- - dnl - Generate man pages ? (default enabled) - dnl --------------------------------------------------------------------------- - AC_ARG_ENABLE(man_pages, AS_HELP_STRING([--disable-man-pages],[Disable man pages generation]), enable_man_pages=$enableval) -@@ -629,6 +644,7 @@ - cflags: ${CFLAGS} - cppflags: ${CPPFLAGS} - Able to run locally: ${enable_local} -+ Use elogind: ${enable_elogind} - Use systemd: ${enable_systemd} - Enable offline update: ${enable_offline_update} - Networking stacks: ${networking_apis} ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -9,6 +9,7 @@ AM_CPPFLAGS = \ - $(SQLITE_CFLAGS) \ - $(POLKIT_CFLAGS) \ - $(PYTHON_CFLAGS) \ -+ $(ELOGIND_CFLAGS) \ - $(SYSTEMD_CFLAGS) \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - -DBINDIR=\"$(bindir)\" \ -@@ -100,6 +101,7 @@ packagekit_direct_LDADD = \ - $(POLKIT_LIBS) \ - $(GIO_LIBS) \ - $(ARCHIVE_LIBS) \ -+ $(ELOGIND_LIBS) \ - $(SYSTEMD_LIBS) - - packagekit_direct_LDFLAGS = \ -@@ -128,6 +130,7 @@ packagekitd_LDADD = \ - $(POLKIT_LIBS) \ - $(GIO_LIBS) \ - $(ARCHIVE_LIBS) \ -+ $(ELOGIND_LIBS) \ - $(SYSTEMD_LIBS) - - packagekitd_LDFLAGS = \ -@@ -153,6 +156,7 @@ pk_self_test_LDADD = \ - $(POLKIT_LIBS) \ - $(GIO_LIBS) \ - $(ARCHIVE_LIBS) \ -+ $(ELOGIND_LIBS) \ - $(SYSTEMD_LIBS) - - pk_self_test_CPPFLAGS = \ ---- a/src/pk-engine.c 2017-06-06 09:12:23.828371176 +0200 -+++ b/src/pk-engine.c 2017-06-06 09:55:47.426385545 +0200 -@@ -98,7 +98,7 @@ - guint owner_id; - GDBusNodeInfo *introspection; - GDBusConnection *connection; --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - GDBusProxy *logind_proxy; - gint logind_fd; - #endif -@@ -281,7 +281,7 @@ - static void - pk_engine_inhibit (PkEngine *engine) - { --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - g_autoptr(GError) error = NULL; - g_autoptr(GUnixFDList) out_fd_list = NULL; - g_autoptr(GVariant) res = NULL; -@@ -331,7 +331,7 @@ - static void - pk_engine_uninhibit (PkEngine *engine) - { --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - if (engine->priv->logind_fd == 0) - return; - g_debug ("closed logind fd %i", engine->priv->logind_fd); -@@ -1830,7 +1830,7 @@ - } - } - --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - /** - * pk_engine_proxy_logind_cb: - **/ -@@ -1872,7 +1872,7 @@ - /* save copy for emitting signals */ - engine->priv->connection = g_object_ref (connection); - --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - /* connect to logind */ - g_dbus_proxy_new (connection, - G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -@@ -2031,7 +2031,7 @@ - if (engine->priv->connection != NULL) - g_object_unref (engine->priv->connection); - --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - /* uninhibit */ - if (engine->priv->logind_fd != 0) - close (engine->priv->logind_fd); ---- a/src/pk-dbus.c 2017-06-06 09:12:13.254370858 +0200 -+++ b/src/pk-dbus.c 2017-06-06 10:09:17.249409857 +0200 -@@ -27,7 +27,7 @@ - #include - #include - --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - #include - #endif - -@@ -177,7 +177,7 @@ - return cmdline; - } - --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - /** - * pk_dbus_get_session_systemd: - **/ -@@ -220,7 +220,7 @@ - pk_dbus_get_session (PkDbus *dbus, const gchar *sender) - { - gchar *session = NULL; --#ifndef HAVE_SYSTEMD -+#ifndef HAVE_SYSTEMD_SD_LOGIN_H - g_autoptr(GError) error = NULL; - #endif - guint pid; -@@ -250,7 +250,7 @@ - } - - /* get session from systemd or ConsoleKit */ --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - session = pk_dbus_get_session_systemd (pid); - #else - /* get session from ConsoleKit */ diff --git a/app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild deleted file mode 100644 index cf2c12a7ae0e..000000000000 --- a/app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# PackageKit supports 3.2+, but entropy and portage backends are untested -# Future note: use --enable-python3 -PYTHON_COMPAT=( python2_7 ) -VALA_USE_DEPEND="vapigen" - -inherit autotools bash-completion-r1 multilib python-single-r1 systemd vala xdg - -MY_PN="PackageKit" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API" -HOMEPAGE="https://www.freedesktop.org/software/PackageKit/" -SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/18" -KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86" -IUSE="cron command-not-found elogind +introspection entropy systemd test vala" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ?? ( elogind systemd ) - vala? ( introspection ) -" - -# While not strictly needed, consolekit is the alternative to systemd-login -# or elogind to get current session's user. -COMMON_DEPEND=" - >=app-shells/bash-completion-2 - dev-db/sqlite:3 - >=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.46.0:2 - >=sys-auth/polkit-0.98 - >=sys-apps/dbus-1.3.0 - ${PYTHON_DEPS} - elogind? ( >=sys-auth/elogind-229.4 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) - systemd? ( >=sys-apps/systemd-204 ) -" -# vala-common needed for eautoreconf -DEPEND="${COMMON_DEPEND} - >=dev-cpp/glibmm-2.4 - dev-libs/libxslt[${PYTHON_USEDEP}] - dev-libs/vala-common - >=dev-util/gtk-doc-am-1.11 - >=dev-util/intltool-0.35.0 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -RDEPEND="${COMMON_DEPEND} - >=app-portage/layman-2[${PYTHON_USEDEP}] - || ( - >=sys-apps/portage-2.2[${PYTHON_USEDEP}] - sys-apps/portage-mgorny[${PYTHON_USEDEP}] - ) - entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] ) - !systemd? ( !elogind? ( sys-auth/consolekit ) ) -" - -PATCHES=( - # Fixes QA Notices: - # - https://github.com/gentoo/gentoo/pull/1760 - # - https://github.com/hughsie/PackageKit/issues/143 - "${FILESDIR}"/${PN}-1.1.1-cache-qafix.patch - - # Adds elogind support: - # - https://bugs.gentoo.org/show_bug.cgi?id=620948 - "${FILESDIR}"/${P}-elogind-support.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Disable unittests not working with portage backend - # console: requires terminal input - sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/transaction-list\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/client"\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/package-sack\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/task\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/console\)://\1:' \ - -i lib/packagekit-glib2/pk-test-daemon.c || die - sed -e 's:^\(.*/packagekit/spawn\)://\1:' \ - -e 's:^\(.*/packagekit/transaction-db\)://\1:' \ - -e 's:^\(.*/packagekit/backend\)://\1:' \ - -i src/pk-self-test.c || die - - eapply_user - use vala && vala_src_prepare - xdg_src_prepare - - # Needed by elogind patch: - eautoreconf -} - -src_configure() { - econf \ - --disable-gstreamer-plugin \ - --disable-gtk-doc \ - --disable-gtk-module \ - --disable-schemas-compile \ - --disable-static \ - --enable-bash-completion \ - --enable-man-pages \ - --enable-nls \ - --enable-portage \ - --localstatedir=/var \ - $(use_enable command-not-found) \ - $(use_enable cron) \ - $(use_enable elogind) \ - $(use_enable entropy) \ - $(use_enable introspection) \ - $(use_enable systemd) \ - $(use_enable test daemon-tests) \ - $(use_enable test local) \ - $(use_enable vala) \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" -} - -src_install() { - emake DESTDIR="${D}" install - prune_libtool_files --all - - dodoc AUTHORS ChangeLog MAINTAINERS NEWS README -} -- cgit v1.2.3-65-gdbad