[gentoo-commits] repo/gentoo:master commit in: gnustep-apps/preferences/files/, gnustep-apps/preferences/

[Bernard Cafarelli]

commit:     24c57098bf3eeee852fe098f7fa424d52021d5d6
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 10:18:20 2017 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 12:21:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c57098

gnustep-apps/preferences: drop old, shorten description

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 gnustep-apps/preferences/Manifest                  |   1 -
 .../files/Preferences-nocreate-extra-dirs.patch    |  18 ---
 .../files/preferences-gnustep-make2.patch          | 164 ---------------------
 .../preferences-1.3.0_pre20061204-r1.ebuild        |  30 ----
 .../preferences-1.3.0_pre20100523.ebuild           |   4 +-
 5 files changed, 2 insertions(+), 215 deletions(-)

diff --git a/gnustep-apps/preferences/Manifest b/gnustep-apps/preferences/Manifest
index d5991526aec..ad3829aa50d 100644
--- a/gnustep-apps/preferences/Manifest
+++ b/gnustep-apps/preferences/Manifest
@@ -1,2 +1 @@
-DIST preferences-1.3.0_pre20061204.tar.gz 230142 SHA256 af60134c5eeb7ed52b7209aacbc93ce64b9526c56a9ca2351c9bd9b872f2dbd7 SHA512 d4112e79360964c4f378841e4355c3719a4ddc9cf4138f4ac4a287f9fb2b0fd8257e4143a31a9748af9b8f50c2ee56f05db3a7a68fbf1882d3c7bf3e5a874b7f WHIRLPOOL 489e32cf03db4b3fb49b51626e706e658885c16013ab2bb1653b57f256d025bf50ce4e77a9ccc701d7599ce7dbddba0b6c23e247a113d7ebf08c50add947761f
 DIST preferences-1.3.0_pre20100523.tar.gz 428922 SHA256 f07a9a2c4daa265f4619af38669eb7ddc4d221d601f75faff39bd7f29afd3e68 SHA512 63a901a974f09e2a6b20affe7df630bdc51284f0faae5de17745f2b335d73ef7c7e39bae3cb14fb807962a82bd9e5214abc55c1f9186b85c1a94a12e30d0eb76 WHIRLPOOL 78c44bce16f58ae3809db7a30f54d3031ee4ed11ef94b770b66533e0353281beffb4b46c2eddf41f3eda0c7a833c64767065779b092769967fd18b1299533897

diff --git a/gnustep-apps/preferences/files/Preferences-nocreate-extra-dirs.patch b/gnustep-apps/preferences/files/Preferences-nocreate-extra-dirs.patch
deleted file mode 100644
index 0710c90906c..00000000000
--- a/gnustep-apps/preferences/files/Preferences-nocreate-extra-dirs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur Preferences.backup/GNUmakefile.preamble Preferences/GNUmakefile.preamble
---- Preferences.backup/GNUmakefile.preamble	2003-08-16 13:19:29.000000000 -0400
-+++ Preferences/GNUmakefile.preamble	2004-06-28 19:51:30.104604048 -0400
-@@ -49,8 +49,8 @@
- GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
- 
- # Additional directories to be created during installation
--ADDITIONAL_INSTALL_DIRS += \
--	$(GNUSTEP_USER_ROOT)/Library/Preferences \
--	$(GNUSTEP_LOCAL_ROOT)/Library/Preferences \
--	$(GNUSTEP_NETWORK_ROOT)/Library/Preferences \
--	$(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
-+#ADDITIONAL_INSTALL_DIRS += \
-+#	$(GNUSTEP_USER_ROOT)/Library/Preferences
-+#	$(GNUSTEP_LOCAL_ROOT)/Library/Preferences
-+#	$(GNUSTEP_NETWORK_ROOT)/Library/Preferences
-+#	$(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
-Only in Preferences: GNUmakefile.preamble~

diff --git a/gnustep-apps/preferences/files/preferences-gnustep-make2.patch b/gnustep-apps/preferences/files/preferences-gnustep-make2.patch
deleted file mode 100644
index 3ac6a7c4f24..00000000000
--- a/gnustep-apps/preferences/files/preferences-gnustep-make2.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -Naur Preferences.orig/GNUmakefile Preferences/GNUmakefile
---- Preferences.orig/GNUmakefile	2004-06-11 00:38:31.000000000 +0200
-+++ Preferences/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
-@@ -55,7 +55,7 @@
- export TOP_SRCDIR :=	$(CURDIR)/../..
- endif
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
- 
- #
- # Resource files
-diff -Naur Preferences.orig/GNUmakefile.preamble Preferences/GNUmakefile.preamble
---- Preferences.orig/GNUmakefile.preamble	2007-11-06 15:49:02.000000000 +0100
-+++ Preferences/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
-@@ -37,7 +37,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
- 
- # Additional directories to be created during installation
- #ADDITIONAL_INSTALL_DIRS += \
-diff -Naur Preferences.orig/Modules/Colors/GNUmakefile Preferences/Modules/Colors/GNUmakefile
---- Preferences.orig/Modules/Colors/GNUmakefile	2006-09-03 19:15:12.000000000 +0200
-+++ Preferences/Modules/Colors/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
-@@ -3,10 +3,10 @@
- BUNDLE_NAME=		Colors
- BUNDLE_EXTENSION=	.prefs
- 
--BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
-+BUNDLE_INSTALL_DIR=	$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
- 
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
- 
- Colors_LANGUAGES= \
- 	English
-diff -Naur Preferences.orig/Modules/Colors/GNUmakefile.preamble Preferences/Modules/Colors/GNUmakefile.preamble
---- Preferences.orig/Modules/Colors/GNUmakefile.preamble	2004-06-11 00:33:55.000000000 +0200
-+++ Preferences/Modules/Colors/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
-@@ -34,7 +34,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
- 
- # Additional directories to be created during installation
- ADDITIONAL_INSTALL_DIRS +=
-diff -Naur Preferences.orig/Modules/Defaults/GNUmakefile Preferences/Modules/Defaults/GNUmakefile
---- Preferences.orig/Modules/Defaults/GNUmakefile	2003-08-16 19:19:29.000000000 +0200
-+++ Preferences/Modules/Defaults/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
-@@ -2,10 +2,10 @@
- 
- BUNDLE_NAME=		Defaults
- BUNDLE_EXTENSION=	.prefs
--BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
-+BUNDLE_INSTALL_DIR=	$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
- 
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
- 
- Defaults_LANGUAGES= \
- 	English
-diff -Naur Preferences.orig/Modules/Defaults/GNUmakefile.preamble Preferences/Modules/Defaults/GNUmakefile.preamble
---- Preferences.orig/Modules/Defaults/GNUmakefile.preamble	2003-08-16 19:35:57.000000000 +0200
-+++ Preferences/Modules/Defaults/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
-@@ -34,7 +34,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
- 
- # Additional directories to be created during installation
- ADDITIONAL_INSTALL_DIRS +=
-diff -Naur Preferences.orig/Modules/Font/GNUmakefile Preferences/Modules/Font/GNUmakefile
---- Preferences.orig/Modules/Font/GNUmakefile	2005-10-12 02:02:36.000000000 +0200
-+++ Preferences/Modules/Font/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
-@@ -3,10 +3,10 @@
- BUNDLE_NAME=		Font
- BUNDLE_EXTENSION=	.prefs
- 
--BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
-+BUNDLE_INSTALL_DIR=	$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
- 
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
- 
- Font_LANGUAGES=	\
- 	English \
-diff -Naur Preferences.orig/Modules/Font/GNUmakefile.preamble Preferences/Modules/Font/GNUmakefile.preamble
---- Preferences.orig/Modules/Font/GNUmakefile.preamble	2003-08-16 19:35:57.000000000 +0200
-+++ Preferences/Modules/Font/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
-@@ -34,7 +34,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
- 
- # Additional directories to be created during installation
- ADDITIONAL_INSTALL_DIRS +=
-diff -Naur Preferences.orig/Modules/Keyboard/GNUmakefile Preferences/Modules/Keyboard/GNUmakefile
---- Preferences.orig/Modules/Keyboard/GNUmakefile	2003-08-16 19:19:29.000000000 +0200
-+++ Preferences/Modules/Keyboard/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
-@@ -3,10 +3,10 @@
- BUNDLE_NAME=		Keyboard
- BUNDLE_EXTENSION=	.prefs
- 
--BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
-+BUNDLE_INSTALL_DIR=	$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
- 
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
- 
- Keyboard_LANGUAGES= \
- 	English
-diff -Naur Preferences.orig/Modules/Keyboard/GNUmakefile.preamble Preferences/Modules/Keyboard/GNUmakefile.preamble
---- Preferences.orig/Modules/Keyboard/GNUmakefile.preamble	2003-08-16 19:35:57.000000000 +0200
-+++ Preferences/Modules/Keyboard/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
-@@ -34,7 +34,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
- 
- # Additional directories to be created during installation
- ADDITIONAL_INSTALL_DIRS +=
-diff -Naur Preferences.orig/Modules/Time/GNUmakefile Preferences/Modules/Time/GNUmakefile
---- Preferences.orig/Modules/Time/GNUmakefile	2003-08-16 19:19:29.000000000 +0200
-+++ Preferences/Modules/Time/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
-@@ -2,10 +2,10 @@
- 
- BUNDLE_NAME=		Time
- BUNDLE_EXTENSION=	.prefs
--BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
-+BUNDLE_INSTALL_DIR=	$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
- 
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
- 
- Time_LANGUAGES= \
- 	English
-diff -Naur Preferences.orig/Modules/Time/GNUmakefile.preamble Preferences/Modules/Time/GNUmakefile.preamble
---- Preferences.orig/Modules/Time/GNUmakefile.preamble	2003-08-16 19:35:57.000000000 +0200
-+++ Preferences/Modules/Time/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
-@@ -34,7 +34,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
- 
- # Additional directories to be created during installation
- ADDITIONAL_INSTALL_DIRS +=

diff --git a/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild b/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild
deleted file mode 100644
index 0b3c7d7fd81..00000000000
--- a/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit gnustep-2
-
-S=${WORKDIR}/${PN/p/P}
-
-DESCRIPTION="Preferences is the GNUstep program with which you define your own personal user experience"
-HOMEPAGE="http://www.nongnu.org/backbone/apps.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-DEPEND="~gnustep-libs/prefsmodule-1.1.1${PV/*_/_}"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/Preferences-nocreate-extra-dirs.patch
-	epatch "${FILESDIR}"/${PN}-gnustep-make2.patch
-}
-
-src_install() {
-#	egnustep_env
-	dodir ${GNUSTEP_SYSTEM_LIBRARY}/Colors
-	gnustep-base_src_install
-}

diff --git a/gnustep-apps/preferences/preferences-1.3.0_pre20100523.ebuild b/gnustep-apps/preferences/preferences-1.3.0_pre20100523.ebuild
index 2d2e3a6c973..25615a813f5 100644
--- a/gnustep-apps/preferences/preferences-1.3.0_pre20100523.ebuild
+++ b/gnustep-apps/preferences/preferences-1.3.0_pre20100523.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=3
@@ -6,7 +6,7 @@ inherit gnustep-2
 
 S=${WORKDIR}/${PN/p/P}
 
-DESCRIPTION="Preferences is the GNUstep program with which you define your own personal user experience"
+DESCRIPTION="GNUstep program to define your own personal user experience"
 HOMEPAGE="http://www.nongnu.org/backbone/apps.html"
 SRC_URI="mirror://gentoo/${P}.tar.gz"