From a5b9e67cd25ebb8538fa845bbc7ae2bedce70229 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Thu, 30 Jun 2016 18:43:43 +0200 Subject: [PATCH] [app-admin/] Drop several old Anaconda deps --- app-admin/firstboot/Manifest | 1 - app-admin/firstboot/firstboot-1.110-r1.ebuild | 42 --------------- app-admin/system-config-date/Manifest | 1 - .../system-config-date-1.9.57-r1.ebuild | 50 ------------------ app-admin/system-config-keyboard/Manifest | 1 - ...config-keyboard-1.3.1-russian-layout.patch | 11 ---- ...nfig-keyboard-1.3.1-turkish-f-layout.patch | 12 ----- .../system-config-keyboard-1.3.1-r2.ebuild | 38 -------------- app-admin/system-config-users/Manifest | 1 - .../files/system-config-users-kill-rpm.patch | 35 ------------- .../system-config-users-1.2.96-r2.ebuild | 52 ------------------- 11 files changed, 244 deletions(-) delete mode 100644 app-admin/firstboot/Manifest delete mode 100644 app-admin/firstboot/firstboot-1.110-r1.ebuild delete mode 100644 app-admin/system-config-date/Manifest delete mode 100644 app-admin/system-config-date/system-config-date-1.9.57-r1.ebuild delete mode 100644 app-admin/system-config-keyboard/Manifest delete mode 100644 app-admin/system-config-keyboard/files/system-config-keyboard-1.3.1-russian-layout.patch delete mode 100644 app-admin/system-config-keyboard/files/system-config-keyboard-1.3.1-turkish-f-layout.patch delete mode 100644 app-admin/system-config-keyboard/system-config-keyboard-1.3.1-r2.ebuild delete mode 100644 app-admin/system-config-users/Manifest delete mode 100644 app-admin/system-config-users/files/system-config-users-kill-rpm.patch delete mode 100644 app-admin/system-config-users/system-config-users-1.2.96-r2.ebuild diff --git a/app-admin/firstboot/Manifest b/app-admin/firstboot/Manifest deleted file mode 100644 index d0f834627..000000000 --- a/app-admin/firstboot/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST firstboot-1.110-1.fc13.src.rpm 171365 SHA256 f463bea5eb96706a09a5e87dd70a4fea0c8e579f756cb8316c96d8db41304f9f SHA512 35ba993be0dd68f98b1deeba6b38a59777177b8cbfab9d57c99bfcb13c19fd52c7eb09aff1a97c48be015d63944b7e296fc988006ddc8aa21c525b44481de46f WHIRLPOOL 94c8ed48e56fc5a64a1c86686b27dfd511c9f9918dcdf25c73c29b908269de08a9b496a48ee5c055fcbccd2ea2b4f02e52d3a69de52a60fed20da48b3d325c61 diff --git a/app-admin/firstboot/firstboot-1.110-r1.ebuild b/app-admin/firstboot/firstboot-1.110-r1.ebuild deleted file mode 100644 index 325153eb5..000000000 --- a/app-admin/firstboot/firstboot-1.110-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -PYTHON_COMPAT=( python2_6 python2_7 ) - -inherit python-r1 distutils-r1 rpm - -# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source -# tarball out of it -RPMREV="1" - -DESCRIPTION="Initial system configuration utility" -HOMEPAGE="http://fedoraproject.org/wiki/FirstBoot" -SRC_URI="mirror://sabayon/${CATEGORY}/${P}-${RPMREV}.fc13.src.rpm" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="gtk" -RDEPEND=" - gtk? ( =dev-python/pygtk-2* ) - dev-python/rhpl - app-admin/system-config-users - app-admin/system-config-date - sys-libs/libuser - dev-python/python-ethtool" -DEPEND="${RDEPEND} - sys-devel/gettext" -PDEPEND="app-admin/system-config-keyboard" - -src_install() { - distutils-r1_src_install - # remove fedorish init script completely - rm -r "${ED}"/etc/rc.d || die -} - -pkg_postrm() { - python_mod_cleanup /usr/share/${PN} -} - diff --git a/app-admin/system-config-date/Manifest b/app-admin/system-config-date/Manifest deleted file mode 100644 index 7933bdd61..000000000 --- a/app-admin/system-config-date/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST system-config-date-1.9.57.tar.bz2 807711 SHA256 d9228773fb5b051cf6b812a7092123606e851ae14b65d6b1424d09101daaa922 diff --git a/app-admin/system-config-date/system-config-date-1.9.57-r1.ebuild b/app-admin/system-config-date/system-config-date-1.9.57-r1.ebuild deleted file mode 100644 index 247aeaa14..000000000 --- a/app-admin/system-config-date/system-config-date-1.9.57-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2004-2011 Sabayon -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" -inherit python base - -DESCRIPTION="The system-config-date tool lets you set the date and time of your machine." -HOMEPAGE="http://fedoraproject.org/wiki/SystemConfig/date" -SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2" - -LICENSE="GPL-1" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="gtk" - -# FIXME: would also require a dependency against anaconda -DEPEND="app-text/docbook-xml-dtd - app-text/docbook-sgml-dtd - app-text/gnome-doc-utils - app-text/rarian - dev-libs/newt - dev-util/desktop-file-utils - dev-util/intltool - sys-devel/gettext" - -# also net-misc/ntp would be a soft-dependency -# but code is redhat-centric, so we won't really -# let user use this crap -# net-misc/ntp -RDEPEND="dev-libs/newt - dev-python/python-slip - dev-python/rhpl - gtk? ( dev-python/pygtk:2 - dev-python/libgnomecanvas-python - x11-themes/hicolor-icon-theme )" - -src_install() { - base_src_install - - # removing .desktop file, not advertising this, it is - # only needed by app-admin/anaconda - rm -rf "${ED}/usr/share/"{man,applications} - rm -rf "${ED}/etc/"{pam.d,security} - rm -rf "${ED}/usr/bin" -} - -pkg_postrm() { - python_mod_cleanup /usr/share/${PN} -} diff --git a/app-admin/system-config-keyboard/Manifest b/app-admin/system-config-keyboard/Manifest deleted file mode 100644 index 1bc58e6f8..000000000 --- a/app-admin/system-config-keyboard/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST system-config-keyboard-1.3.1.tar.gz 118192 SHA256 ba446a871fa4db096930825cbc656541cac5e0302e955e3656289532967159ed SHA512 b9215c8a7d6b9a6f2fb1f8bddef4d3732556733e03aab81b5db979c71f9bd7c8098b1cd8d2d6ff120eb336a8908e5d27aa9ed4925a5fc5b6a89acde889f11ccf WHIRLPOOL 50c68638a1671a1d6efc79edd9dde634987a693efeafdfe2f680dfd2a82fe9b6fd99da834d2f90dd5626db15f87ce9e17e5986b4d99bcf56a2c45171f00998e2 diff --git a/app-admin/system-config-keyboard/files/system-config-keyboard-1.3.1-russian-layout.patch b/app-admin/system-config-keyboard/files/system-config-keyboard-1.3.1-russian-layout.patch deleted file mode 100644 index 219824c22..000000000 --- a/app-admin/system-config-keyboard/files/system-config-keyboard-1.3.1-russian-layout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- system-config-keyboard-1.3.1.orig/lib/keyboard_models.py -+++ system-config-keyboard-1.3.1/lib/keyboard_models.py -@@ -207,7 +207,7 @@ class KeyboardModels: - 'ro-std-cedilla' : [_('keyboard|Romanian Standard Cedilla'), 'ro', 'pc105', 'std_cedilla', ''], - # Translators: the word before the bar is just context and - # doesn't need to be translated. Only after will be translated. -- 'ru' : [_('keyboard|Russian'), 'ru,us', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'], -+ 'ru' : [_('keyboard|Russian'), 'ru,us', 'pc105', 'intl-unicode,', 'grp:ctrl_shift_toggle,grp_led:scroll,compose:ralt,terminate:ctrl_alt_bksp'], - # Translators: the word before the bar is just context and - # doesn't need to be translated. Only after will be translated. - 'sr-cy' : [_('keyboard|Serbian'), 'rs', 'pc105', '', ''], diff --git a/app-admin/system-config-keyboard/files/system-config-keyboard-1.3.1-turkish-f-layout.patch b/app-admin/system-config-keyboard/files/system-config-keyboard-1.3.1-turkish-f-layout.patch deleted file mode 100644 index 0fec8875c..000000000 --- a/app-admin/system-config-keyboard/files/system-config-keyboard-1.3.1-turkish-f-layout.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- system-config-keyboard-1.3.1.orig/lib/keyboard_models.py -+++ system-config-keyboard-1.3.1/lib/keyboard_models.py -@@ -240,7 +240,8 @@ class KeyboardModels: - 'tml-uni' : [_('keyboard|Tamil (Typewriter)'), 'in,us', 'pc105', 'tam_TAB', 'grp:shifts_toggle,grp_led:scroll'], - # Translators: the word before the bar is just context and - # doesn't need to be translated. Only after will be translated. -- 'trq' : [_('keyboard|Turkish'), 'tr', 'pc105', '', ''], -+ 'trq' : [_('keyboard|Turkish (Q)'), 'tr', 'pc105', '', ''], -+ 'trf' : [_('keyboard|Turkish (F)'), 'tr', 'pc105', '', ''], - # Translators: the word before the bar is just context and - # doesn't need to be translated. Only after will be translated. - 'uk' : [_('keyboard|United Kingdom'), 'gb', 'pc105', '', ''], diff --git a/app-admin/system-config-keyboard/system-config-keyboard-1.3.1-r2.ebuild b/app-admin/system-config-keyboard/system-config-keyboard-1.3.1-r2.ebuild deleted file mode 100644 index c95948662..000000000 --- a/app-admin/system-config-keyboard/system-config-keyboard-1.3.1-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2004-2011 Sabayon -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" -inherit base python - -DESCRIPTION="Fedora legacy keyboard management tool." -HOMEPAGE="https://fedorahosted.org/system-config-keyboard/wiki" -SRC_URI="https://fedorahosted.org/released/system-config-keyboard/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="" -DEPEND="dev-util/intltool - sys-apps/findutils - sys-devel/gettext - dev-util/desktop-file-utils" -RDEPEND="app-admin/firstboot" - -PATCHES=( - "${FILESDIR}/${P}-russian-layout.patch" - "${FILESDIR}/${P}-turkish-f-layout.patch" -) - -src_install() { - base_src_install - - # remove .desktop files - find "${ED}/usr/share/applications" -name "*.desktop" -delete || die - rm "${ED}/usr/bin/system-config-keyboard" || die - rm "${ED}/usr/sbin/system-config-keyboard" || die -} - -pkg_postrm() { - python_mod_cleanup /usr/share/${PN} -} diff --git a/app-admin/system-config-users/Manifest b/app-admin/system-config-users/Manifest deleted file mode 100644 index d95715bc3..000000000 --- a/app-admin/system-config-users/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST system-config-users-1.2.96.tar.bz2 261231 SHA256 01ecd4b4f485c8fd3b92fe6a4bfbf1b81cb60b455593b9502a29580077440356 diff --git a/app-admin/system-config-users/files/system-config-users-kill-rpm.patch b/app-admin/system-config-users/files/system-config-users-kill-rpm.patch deleted file mode 100644 index 4913c32d9..000000000 --- a/app-admin/system-config-users/files/system-config-users-kill-rpm.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Nurp system-config-users-1.2.96.orig/src/mainWindow.py system-config-users-1.2.96/src/mainWindow.py ---- system-config-users-1.2.96.orig/src/mainWindow.py 2010-03-31 11:38:17.000000000 +0200 -+++ system-config-users-1.2.96/src/mainWindow.py 2010-04-11 17:53:45.060057458 +0200 -@@ -26,7 +26,6 @@ import gobject - import gtk.glade - import string - import os --import rpm - import shutil - - import libuser -@@ -652,9 +651,6 @@ class mainWindow: - dlg.run () - dlg.destroy () - return -- ts = rpm.TransactionSet () -- if ts.dbMatch ("basenames", homeDir).count () > 0 or ts.dbMatch ("basenames", os.path.abspath (homeDir)).count () > 0 or ts.dbMatch ("basenames", os.path.realpath (homeDir)).count () > 0: -- errMsgs.append (_("- An installed software package contains this directory.")) - if uid < 500 or (user == "nfsnobody" and (long (uid) == 65534L or long (uid) == 4294967294L)): - errMsgs.append (_("- A system user owns this directory and removing it may impair the system's integrity.")) - if not os.access(homeDir, os.W_OK): -@@ -910,12 +906,7 @@ class mainWindow: - self.on_properties_activate() - - def isSELinuxInstalled(self): -- ts = rpm.TransactionSet() -- -- mi = ts.dbMatch('name', 'policy-sources') -- if mi.count() > 0: -- return True -- return False -+ return os.path.lexists("/usr/sbin/getenforce") and os.access("/usr/sbin/getenforce", os.X_OK) - - def isSELinuxEnabled(self): - if self.isSELinuxInstalled(): diff --git a/app-admin/system-config-users/system-config-users-1.2.96-r2.ebuild b/app-admin/system-config-users/system-config-users-1.2.96-r2.ebuild deleted file mode 100644 index 73e4ab29a..000000000 --- a/app-admin/system-config-users/system-config-users-1.2.96-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2004-2011 Sabayon -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" -inherit python base - -DESCRIPTION="The system-config-users tool lets you manage the users and groups on your computer." -HOMEPAGE="http://fedoraproject.org/wiki/SystemConfig/users" -SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2" - -LICENSE="GPL-1" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="X" - -DEPEND="dev-util/desktop-file-utils - dev-util/intltool - sys-apps/findutils - sys-devel/gettext" - -# FIXME: would require rpm-python -RDEPEND=" - X? ( >=dev-python/pygtk-2.6 - x11-misc/xdg-utils - ) - >=sys-libs/libuser-0.56 - sys-libs/cracklib - sys-process/procps" - -PATCHES=( "${FILESDIR}/${PN}-kill-rpm.patch" ) - -pkg_postrm() { - python_mod_cleanup /usr/share/${PN} -} - -# FIXME: this package should depend against sys-apps/usermode -# which has been removed from Portage in May, 2009. -# If you intend to provide a full package in future (and not -# just stuff required by app-admin/anaconda, please consider -# to re-add sys-apps/usermode (version bumping, QA checking) -# and remove the hackish code in src_install below -src_install() { - base_src_install - - # See FIXME above - rm -rf "${ED}/usr/share/"{man,applications} - rm -rf "${ED}/etc/"{pam.d,sysconfig,security} - rm -rf "${ED}/etc/sysconfig" - rm -rf "${ED}/usr/bin" - find "${ED}" -name "*.pyc" | xargs rm -f -}