Fixed HOMEPAGE and SRC_URI. Wiped out older versions...

6 files changed, 13 insertions, 158 deletions

diff --git a/x11-plugins/wmcalc/ChangeLog b/x11-plugins/wmcalc/ChangeLog
index 75bd141b67c0..1be24db017bf 100644
--- a/x11-plugins/wmcalc/ChangeLog
+++ b/x11-plugins/wmcalc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmcalc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.11 2004/10/19 08:52:43 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.12 2004/11/12 22:54:34 s4t4n Exp $
+
+  12 Nov 2004; Michele Noberasco <s4t4n@gentoo.org> wmcalc-0.4.ebuild:
+  Changed HOMEPAGE to www.dockapps.org as the original one no longer
+  exists. Changed SRC_URI to point to the gentoo mirrors...
+  wmcalc-0.4.ebuild:
+  Removed older ebuild.
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmcalc-0.4.ebuild:
   Stable on amd64.
diff --git a/x11-plugins/wmcalc/Manifest b/x11-plugins/wmcalc/Manifest
index f6da52a129a6..d673f4bf813d 100644
--- a/x11-plugins/wmcalc/Manifest
+++ b/x11-plugins/wmcalc/Manifest
@@ -1,9 +1,6 @@
-MD5 dd8ae294235ff4d97a706e0d95f35f4a ChangeLog 1506
+MD5 09adef54d6256ab89fb433415fa83aef wmcalc-0.4.ebuild 747
+MD5 4432f9a71d83a10d6881969cb1271968 ChangeLog 1749
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 b98a8dac1a1a7c0d932d302bb2e42f36 wmcalc-0.3.ebuild 811
-MD5 9c2aeac28c14789c7934cbc757400692 wmcalc-0.4.ebuild 766
-MD5 a8abd06be816518c8cd173878dbf5475 files/digest-wmcalc-0.3 66
-MD5 8a4c1371e94fdb2e66d601f877435b66 files/wmcalc-0.3-gentoo.diff 4256
-MD5 cb4a94f1ebb3397806349e863d673280 files/wmcalc.man 4751
 MD5 40195ab356ef3fd7ae5183096026fb98 files/digest-wmcalc-0.4 61
+MD5 cb4a94f1ebb3397806349e863d673280 files/wmcalc.man 4751
 MD5 3047ad515640b4bf2d408530eb9c0a0b files/wmcalc-0.4-Makefile.patch 493
diff --git a/x11-plugins/wmcalc/files/digest-wmcalc-0.3 b/x11-plugins/wmcalc/files/digest-wmcalc-0.3
deleted file mode 100644
index e52c63b01102..000000000000
--- a/x11-plugins/wmcalc/files/digest-wmcalc-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c7fdb47983258a7eae5fffdac6305a8 wmcalc_0.3.orig.tar.gz 56944
diff --git a/x11-plugins/wmcalc/files/wmcalc-0.3-gentoo.diff b/x11-plugins/wmcalc/files/wmcalc-0.3-gentoo.diff
deleted file mode 100644
index 04f03b54ab51..000000000000
--- a/x11-plugins/wmcalc/files/wmcalc-0.3-gentoo.diff
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -u wmcalc-0.3.orig/.wmcalc wmcalc-0.3/.wmcalc
---- wmcalc-0.3.orig/.wmcalc	Tue Nov 14 21:18:08 2000
-+++ wmcalc-0.3/.wmcalc	Fri Jul 19 11:48:35 2002
-@@ -31,5 +31,5 @@
- # The ImagChar variable allows the user to choose between 'i' and 'j' to 
- # represent the sqrt(-1).  (Electrical Engineers (such as myself) use 'j' 
- # rather than 'i.')
--#ImagChar	i
--ImagChar	j
-+ImagChar	i
-+#ImagChar	j
-diff -u wmcalc-0.3.orig/Makefile wmcalc-0.3/Makefile
---- wmcalc-0.3.orig/Makefile	Sun Dec 10 23:51:48 2000
-+++ wmcalc-0.3/Makefile	Fri Jul 19 11:47:22 2002
-@@ -1,4 +1,4 @@
--INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include
-+INCLUDES =-I/usr/X11R6/include -I/usr/X11R6/include/X11 -I/usr/local/include
- LIBINC =-L/usr/X11R6/lib
- LIBS = -lX11 -lXpm -lXext -lm
- 
-diff -u wmcalc-0.3.orig/wmcalc.c wmcalc-0.3/wmcalc.c
---- wmcalc-0.3.orig/wmcalc.c	Thu Jan 18 01:18:25 2001
-+++ wmcalc-0.3/wmcalc.c	Fri Jul 19 11:57:35 2002
-@@ -90,6 +90,7 @@
-     01/17/01   Updated to use XLookupString to get KeySym
-     11/09/00   Added Events for focus and keyboard work.
-     11/01/00   File Header Added
-+    21/09/01   Added global configfile by Gordon Fraser
-  ****************************************************************/
- int main( int argc, char **argv ) {
-   XEvent report;
-@@ -428,7 +429,7 @@
-   flush_expose( iconwin ); 
-   XCopyArea(display, visible.pixmap, iconwin, gc, 0, 0,
- 	    visible.attributes.width, visible.attributes.height, 0, 0 );
--  if ( Verbose ) printf("In Redraw()\n");	
-+  //  if ( Verbose ) printf("In Redraw()\n");	
-   displaystr();
- }  /***** End of function redraw() ********************************/
- 
-@@ -471,7 +472,6 @@
-  ****************************************************************/
- int whichKey (KeySym keysym) {
-   extern int      Verbose;
--  extern Display  *display;
-   int        func   = NO_BUTTON;
- 
-   if (Verbose) printf("KeySym 0x%x received, decoding...\n", (int) keysym);
-diff -u wmcalc-0.3.orig/wmcalc_c.h wmcalc-0.3/wmcalc_c.h
---- wmcalc-0.3.orig/wmcalc_c.h	Thu Jan 18 01:16:14 2001
-+++ wmcalc-0.3/wmcalc_c.h	Fri Jul 19 11:46:52 2002
-@@ -17,6 +17,7 @@
- #define CALC_CMD_SIZE 128
- #define CONFFILENAME  "/.wmcalc"
- #define CONFTEMPFILE  "/tmp/wmcalc.tmp"
-+#define CONFIGGLOBAL  "/etc/wmcalc.conf"
- #define VER           0
- #define REL           3
- 
-diff -u wmcalc-0.3.orig/wmcalcswitch.c wmcalc-0.3/wmcalcswitch.c
---- wmcalc-0.3.orig/wmcalcswitch.c	Thu Nov  9 20:05:00 2000
-+++ wmcalc-0.3/wmcalcswitch.c	Fri Jul 19 12:01:16 2002
-@@ -399,10 +399,16 @@
- 
-   /* Open current Config file */
-   if ((fp = fopen(configfile, "r")) == NULL) {  // Can't find config file
--    printf("%s: Configuration File not found\n", configfile);
-+    printf("%s: Cannot create configuration file\n", configfile);
-     return(ERR_FILE_NOT_FOUND);
-   }
- 
-+  /* We cannot write to the global config-file... */
-+  if(!strcmp(configfile, CONFIGGLOBAL)) {
-+    strcpy(configfile, getenv("HOME"));  // Added to wmbutton by Gordon Fraser, 9/21/01
-+    strcat(configfile, CONFFILENAME);    
-+  }
-+
-   /* Open Temporary File */
-   if ((fptmp = fopen(tempfile, "w")) == NULL) {  // Can't open file in /tmp
-     fprintf(stderr, "%s: Temporary File Open Failed\n", tempfile);
-@@ -479,9 +485,14 @@
-   
-   sepstr = &sep_ch;
- 
--  if ((fp = fopen(configfile, "r")) == NULL) {  // Can't find config file
--    fprintf(stderr, "%s: Configuration File not found\n", configfile);
--    return(ERR_FILE_NOT_FOUND);
-+  if ((fp = fopen(configfile, "r")) == NULL) {    // Can't find config file
-+    strcpy(configfile, CONFIGGLOBAL);             // ...so try to open global config
-+    if ((fp = fopen(configfile, "r")) == NULL) {  // Can't find global config file
-+      fprintf(stderr, "%s: Configuration File not found\n", configfile);
-+      return(ERR_FILE_NOT_FOUND);
-+    } else {
-+      write_config();                             // if global config opened, save in homedir
-+    }
-   }
-   else {
-     if (Verbose) printf("%s: Found Configuration File\n", configfile);
-@@ -498,7 +509,7 @@
- 					      understood */
- 	i = 0;
- 	/* Loop while we haven't found the variable */
--	while (((strncmp(line, CfgVarList[i], strlen(CfgVarList[i]))) != NULL)
-+	while (((strncmp(line, CfgVarList[i], strlen(CfgVarList[i]))) != 0)
- 	       && (i < MAX_LABEL)) {
- 	  i++;
- 	}
diff --git a/x11-plugins/wmcalc/wmcalc-0.3.ebuild b/x11-plugins/wmcalc/wmcalc-0.3.ebuild
deleted file mode 100644
index cc46fbc31f70..000000000000
--- a/x11-plugins/wmcalc/wmcalc-0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.3.ebuild,v 1.11 2004/06/24 23:05:56 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="A WindowMaker DockApp calculator"
-HOMEPAGE="http://members.cox.net/ehf_dockapps/wmcalc/whatis.html"
-SRC_URI="mirror://debian/pool/main/w/wmcalc/${PN}_${PV}.orig.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc"
-DEPEND="virtual/x11"
-
-S=${WORKDIR}/${P}.orig
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	dobin wmcalc
-
-	dodoc README COPYING
-
-	newman ${FILESDIR}/wmcalc.man wmcalc.1
-
-	insinto /etc
-	newins .wmcalc wmcalc.conf
-
-	insinto /etc/skel
-	doins .wmcalc
-}
diff --git a/x11-plugins/wmcalc/wmcalc-0.4.ebuild b/x11-plugins/wmcalc/wmcalc-0.4.ebuild
index c61a16af8463..aa5de5380539 100644
--- a/x11-plugins/wmcalc/wmcalc-0.4.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild,v 1.5 2004/10/19 08:52:43 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild,v 1.6 2004/11/12 22:54:34 s4t4n Exp $
 
 inherit eutils
 
 DESCRIPTION="A WindowMaker DockApp calculator"
-HOMEPAGE="http://freakzone.net/gordon/#wmcalc"
-SRC_URI="http://freakzone.net/gordon/src/${P}.tar.gz"
+HOMEPAGE="http://dockapps.org/file.php/id/130"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ppc ppc64"