gentoo resync : 06.12.2017

5 files changed, 6 insertions, 207 deletions

diff --git a/x11-plugins/wmcalc/Manifest b/x11-plugins/wmcalc/Manifest
index ab00496a3242..39481f834be9 100644
--- a/x11-plugins/wmcalc/Manifest
+++ b/x11-plugins/wmcalc/Manifest
@@ -1,8 +1,3 @@
-AUX wmcalc.man 4751 BLAKE2B 5bd6e34a49d385ac0c0af1b700f00e4f6173bd71563e0d9a857450b3d1862fbdf2b1ff1f79d0204aa23f87d8db6f863e0df6070f234d041e8445078233bb7f3f SHA512 df384bdd6e30f76c6d9c45066e0b49b503d13be587f6e385d2024f5850d66385fdbbb29a06ed9c2da718a2c74e29880f3402d79e25488fd35a6898623e395ad0
-DIST wmcalc-0.4.tar.gz 42694 SHA256 944b69ce2e5489dc0ec78fc02d4da26af2102a18300eb3607c3a5de4b97a384a SHA512 2a7ff3c2cb50dec2a5961a16832f09571d2096849a16d8d97b21a8b2dbce98e7061b974d8ffdcfd555e25e63fa76690e3af794006f74bb4d44b3f0acd8a19fbe WHIRLPOOL 38dd6d2d4eb49425099b6976fb71b7edbdae8be9f2dbf92effdb312b7c2d54e3398fc3a61e1f44f4f698d9af349f062ffd3d18b7aeebefacd14921356fcdb7e6
-DIST wmcalc-0.5.tar.gz 43834 SHA256 da08429c045ad4434158c852b3db97be06bcef2c42bafac2749821cf0b015e35 SHA512 750f7e74ff60ed61a18e96ca6ed6347be77bc559384911f701a214e5db19d15178eb0a68b7abd0f91369287910b39e0a7d18f24adedf045d9d536e9b084b53f3 WHIRLPOOL 1d2ba999fde06bda49c06cd65ba1f5f0682a700e10d1854ce8aacaed96507067217dce70c533ce074351270973c17870479a12d6319f4ad7750483d6d627fd0e
-DIST wmcalc-0.6.tar.gz 45386 SHA256 32c0e4ae02600f1b7ea3c88ac385c099cf5ee80e10b097d654a016f433b9a36a SHA512 00be5e0ef62c9a47b4f09d640826f144eed3226e8a1471df4e80b54cd0f7d7bb9ff3fbac94355529646673ebe665f9226aca7dd51581d6c6775e2dc5a913501b WHIRLPOOL 353a9cc8d9d9ed4eba157a918552e8a1fa3d4ef8f0584e2a0f13dcbd81959ffb3d0713030eb44f8b7dddbd18dc708290e509be65b9e2e047383ff498bc10b201
-EBUILD wmcalc-0.4.ebuild 990 BLAKE2B bf7235b7ea22fc06fab2048188440e06294678cec70b407908fc2de2b91fddb3b182012cfc48cf33b62a6e042f9a448f2ee6e6906fd5ee4b5ec47f4211711349 SHA512 64ee40e6bfec176af67127fdc9fdae6001581302fe27855e0518691b4ac5a01c9199a646626173eb237b3811dea37e03a741b8af5e7b787ad48384d1fbb70f23
-EBUILD wmcalc-0.5.ebuild 707 BLAKE2B 5f58a9dd83dba46a33562a4da1bae8dd06aa3f8e9be347e1ceb28f4490e05580a88e6d31ca1daa57fcc91b3817d460cb483ebbee26e4eeac00062a5c1080eee7 SHA512 dd7900654aa0501397d12a5e2d6e80304b8cf573d4e5de73a76d440a2ef742ecb010b3cc86bc40711c5d1d80ec45150c93a9c4e1a82ad39ae4ce975d25379019
-EBUILD wmcalc-0.6.ebuild 604 BLAKE2B 811990ab0e1980839d54125a0016d8c26f5f07a205cde96dca62a2ba7ee852c398aed1bbbac8c4ed25d3a8cf153eee79b6ea3e799d715681d4e46e241405ce12 SHA512 1d460a36de92ff152996df2b28a8a760ede5347f1f267920f3dc4b522efb51a9fc44ab78707f00fe78ce7b541badd313aeea5ca64ed697776580a4dd091059b2
+DIST wmcalc-0.6.tar.gz 44250 BLAKE2B ddcc90bb9d8cf203e1c24b73ff5556d7d11265eaaa93d70908c4e300cbd91bf7fbdca87b67bbd07d7e95439c5326c4853c60d80cfc3401507968fb80b2dd3bb7 SHA512 bdde94f44462733bfede021329b44f21d377fe8a6089c1c457d71f35481b8a01918d92aa79f60d47c791ddf8ee2a9abdb4185ab30584afba558a289a3e786841
+EBUILD wmcalc-0.6.ebuild 652 BLAKE2B 9f207f66f9d1863c71f71b00c86141f02360db136c005f5e46a6bb7b30b6f44cf664fb71ab7d4f053ba7cfbf0ecc018ac31a634a1a0fe57cc405a4be3de372a0 SHA512 a4c7a74378a1573ba81f46dd008523ec6e0b08bf43de9dedb008193a61cb73454ad96d7eb827a9c2cf824cc51bb44b36bfe17c716ee9ae2e15d54f0f2e942332
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcalc/files/wmcalc.man b/x11-plugins/wmcalc/files/wmcalc.man
deleted file mode 100644
index 4485d57c3fcf..000000000000
--- a/x11-plugins/wmcalc/files/wmcalc.man
+++ /dev/null
@@ -1,117 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH WMCALC 1 "September 20, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-wmcalc \- dockable calculator application
-.SH SYNOPSIS
-.B wmcalc
-[-g \fIgeometry\fP] [-d \fIdisplay\fP] [-v] [-f \fIconfigfile\fP] [-h]
-
-.SH DESCRIPTION
-This manual page documents briefly the
-.B wmcalc
-command.
-This manual page was written for the Gentoo Linux distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBwmcalc\fP is a program designed to act as a simple calculator offering basic operations like addition, subtraction, multiplication, division, square and squareroot.  It is different from other calculator programs, however in that it is designed to take up very little desktop space.  As such, it can be left running on the desktop at all times.  It is intended to placed in the WindowMaker dock, or in Wharf under Afterstep, though it should run as well under any window manager. 
-
-
-Buttons are defined as:
-.nf
- ____________________  
-|       x00          |  x = 1 for Left Mouse Button
-| 0 1 2 3 4 5 6 7 8 9|  x = 2 for Middle Mouse Button
-|--------------------|  x = 3 for Right Mouse Button 
-|x01 x02 x03 x04 x05 |                
-|x06 x07 x08 x09 x10 |  Note: the numbers 0..9 are the
-|x11 x12 x13 x14 x15 |         indicators for memory cells  
-|x16 x17 x18 x19 x20 |         0..9 respectively
- -------------------- 
-.fi
-.TP
-Button Functions:
-.TP
-.B 100
-Reinitialize the calculator. (100 = Left Mouse Button on Display)
-.TP
-.B 200
-Clear all the memory registers (0..10)
-.TP
-.B 300
-Clear the current number being entered only
-.TP
-.B x11
-Start a program defined by CalcStart variable in config file
-.TP
-.B 1yy
-Perform function shown on button
-.TP
-.B 2yy
-Recall number from memory location [0-9] to display for calculation if yy = 2,3,4, 7,8,9, 12, 13, 14, 17 otherwise, can run a user-defined function (not implemented)
-.TP
-.B 3yy
-Store Displayed number in memory location [0-9] if yy = 2,3,4, 7,8,9, 12,13,14, 17 otherwise, can run a user-defined function (not implemented)
-.TP
-.B 1xx
-Hopefully the other functions are obvious from their button graphics.
-
-
-.SH OPTIONS
-.TP
-.B \-g <geometry>
-Window Geometry - ie: 64x64+10+10
-.TP
-.B \-d  <display>
-Display -  ie: 127.0.0.1:0.0
-.TP
-.B \-f  <filename>
-Full path to configuration file.
-.TP
-.B \-v
-Verbose Mode. 
-.TP
-.B \-h
-Help.
-.SH FILES
-.TP
-.I /etc/wmbutton.conf
-system wide wmbutton configuration file which will be used for all users who start wmcalc the first time.
-.TP
-.I ~/.wmcalc
-The configuration file (.wmcalc) is written by wmcalc whenever the user requests to store a number to memory. This file is automatically created the first time a user launches wmcalc with /etc/wmcalc.conf as template. As a part of this process, a file is written to /tmp. If /tmp is not accessible, it tries in the user's home directory, as defined by the environment variable HOME. This file is erased as soon as it is written over the main configuration file.
-.SH CONFIGURATION
-.TP
-The configuration file is case sensitive. A # starts a comment, and lines consisting entirely of whitespace are ignored. The syntax is simply:
-.TP
-.B <variable> <content>
-Where <variable> and <content> need to be seperated by a Tab \\t and \fBnot\fP spaces.
-.TP
-\fBmem0 - mem9\fP Calculator Memory Locations. These must all exist, though they may be in any order.
-.TP
-\fBCalcStart\fP The CalcStart variable is intended to allow the user to start a larger calculator for more complicated needs.  Everything after the tab '\\t' character is sent unmodified in a system() call, so anything you can type at the command prompt may be put here.
-.TP
-\fBImagChar\fP The ImagChar variable allows the user to choose between 'i' and 'j' to represent the sqrt(-1).
-
-.SH AUTHOR
-wmcalc was written by Edward H. Flora <ehflora@access1.net>, and is licensed under the terms of the GNU  General Public License.
-.TP
-This manual page was written by Gordon Fraser <gordon@freakzone.net>, for the Debian GNU/Linux system (but may be used by others).
-
diff --git a/x11-plugins/wmcalc/wmcalc-0.4.ebuild b/x11-plugins/wmcalc/wmcalc-0.4.ebuild
deleted file mode 100644
index 1ac5879a3c7b..000000000000
--- a/x11-plugins/wmcalc/wmcalc-0.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A WindowMaker DockApp calculator"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/130"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e "s:gcc:$(tc-getCC):g" \
-		-e "s:-O2:${CFLAGS}:g" -i Makefile
-
-	#Honour Gentoo LDFLAGS, see bug #337434
-	sed -e "s:-o \${TARGET}:\$(LDFLAGS) -o \${TARGET}:" -i Makefile
-}
-
-src_compile() {
-	emake INCLUDES="-I/usr/include/X11" \
-		LIBINC="-L/usr/$(get_libdir)" \
-		|| die "emake failed."
-}
-
-src_install() {
-	dodir /etc /usr/bin
-
-	emake DESTDIR="${D}" PREFIX="/usr" install \
-		|| die "emake install failed."
-
-	dodoc README
-	newman "${FILESDIR}"/wmcalc.man wmcalc.1
-}
diff --git a/x11-plugins/wmcalc/wmcalc-0.5.ebuild b/x11-plugins/wmcalc/wmcalc-0.5.ebuild
deleted file mode 100644
index 31a94d093b46..000000000000
--- a/x11-plugins/wmcalc/wmcalc-0.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A WindowMaker DockApp calculator"
-HOMEPAGE="http://www.dockapps.net/wmcalc"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S=${WORKDIR}/dockapps
-
-src_prepare() {
-	sed -e "/\$(INSTALL_DIR)/s/\/man1//" -i Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	dodoc README
-}
diff --git a/x11-plugins/wmcalc/wmcalc-0.6.ebuild b/x11-plugins/wmcalc/wmcalc-0.6.ebuild
index 31d47e540fc7..cce461c7828d 100644
--- a/x11-plugins/wmcalc/wmcalc-0.6.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.6.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="A WindowMaker DockApp calculator"
 HOMEPAGE="http://www.dockapps.net/wmcalc"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,6 +19,9 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+# Specific to this tarball
+S=${WORKDIR}/dockapps-43ddcdf
+
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }