Version bump to latest dmake (should build libreoffice). Drop overshadowed versions.

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

6 files changed, 280 insertions, 96 deletions

diff --git a/dev-util/dmake/ChangeLog b/dev-util/dmake/ChangeLog
index 81b5ac957472..63e9412bbb32 100644
--- a/dev-util/dmake/ChangeLog
+++ b/dev-util/dmake/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/dmake
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dmake/ChangeLog,v 1.23 2011/07/18 23:46:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dmake/ChangeLog,v 1.24 2011/07/21 11:59:53 scarabeus Exp $
+
+*dmake-4.12 (21 Jul 2011)
+
+  21 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.12-fix-overlapping-stcpys.patch, -dmake-4.11.ebuild,
+  -dmake-4.11-r1.ebuild, +dmake-4.12.ebuild:
+  Version bump to latest dmake (should build libreoffice). Drop overshadowed
+  versions.
 
   18 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> dmake-4.11-r1.ebuild:
   Escape the variable to avoid undefined command during src_prepare phase.
diff --git a/dev-util/dmake/Manifest b/dev-util/dmake/Manifest
index 8d2b2f0d9b94..c624d7784770 100644
--- a/dev-util/dmake/Manifest
+++ b/dev-util/dmake/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 4.12-fix-overlapping-stcpys.patch 6654 RMD160 0f12776b131501be3e2c969ef9954484dd5cc00f SHA1 44eb17cb280bc3c387dc52c86c4962ec02ee7112 SHA256 dbbfebfc860a81b66b818648eb9500b2757f340bcff5aa31c24240f239ad80fe
 AUX dmake-4.1-r1.diff 5005 RMD160 1850bd6061b9b3ea5573ddc630f3d2ea34e08c5b SHA1 d224098328f0dc54b7c7f0a14ab0b1b61c93424a SHA256 fefc508c0a55740f41a1f1cac85c12227be847e6013368e1db19fe1405fb22e3
 DIST dmake-4.1pl1-src.tar.gz 473427 RMD160 ba76d48a6057b6af01b8abd7c72cc7521f60a983 SHA1 6262a38d58fdb69242ddfe663be9caada1882d64 SHA256 98aca7d485e1c6284b439d6e7636b7636d9969869bbc190f27eba475d4cacc6f
-DIST dmake_4.11.zip 1008663 RMD160 020b258a89f1bda991777094a27ad362126c9c04 SHA1 1afd8c7a0ae0b934771d541ba1177b54e4a38602 SHA256 33fb3fb3737655ece89a79ae40e7ba8eb4ab7de8bb10adf2e7737560da31ee36
+DIST dmake_4.12.orig.tar.gz 745531 RMD160 c36d8c2f6f89d39103dcdcfb90fdcd3df02e3f94 SHA1 dbdb9c9f226cdac508a391e3cd0d8a0c2e6ccb46 SHA256 142aea347a825f10a37c5f8a39584dcc96a15838b17ea418172834a8778ba205
 EBUILD dmake-4.1-r1.ebuild 1011 RMD160 79cbbffe25123c8f937b61ae8c6c3625ddb507e7 SHA1 267cccc518464906ae44613766e9da9d6f630afc SHA256 baaf24023a4d69bdad9bc3191a1797b45f459f465d29064a7c16d14b6accd915
-EBUILD dmake-4.11-r1.ebuild 1142 RMD160 8ae4a243dca7023d949c5c1a4eff88ee2834aaf2 SHA1 3185e2e31f4fb87dc4c42f7b8cb280b9a0384090 SHA256 81f2cbb5fd5def11279e86a43328252b8286fd81d255572f700160983f70e5df
-EBUILD dmake-4.11.ebuild 1020 RMD160 c047317d7282cad1e6a70540e4057b091eebc47c SHA1 86e84ed77e9c3ef0ee6a0b7593b1af4028642fb2 SHA256 fe2a0b1b2a25987f237ed5ea4169b815ae80ec5e3deb662875a8efa6f1a0f28d
-MISC ChangeLog 2919 RMD160 73fd39ee5422b00a46ad122ba16cc3e7b2e9303b SHA1 ff5682db6e240c89d21b5fef518a4dd993a02b3d SHA256 d79268950ac79c742974141dd9e00cd10b7bb1cbcdba226599446fecc63f7a52
+EBUILD dmake-4.12.ebuild 685 RMD160 5c9f6d71890a4f595005ad1b55ec60cf46a60551 SHA1 2e897f6ce3829da670a0f0159100cdfbd0f3533e SHA256 bf36b7aa42c6f6a2847794e001624845eabebc5da1610c008040bc7e697d249e
+MISC ChangeLog 3200 RMD160 66fb86978c4703f5ffc5c5f9cfa24397351e03bd SHA1 cedea6b7a1d6e8f3648343c8bad25f692b04c8c9 SHA256 1168605f997807c3d172fcc9ec86685eefac30270b894715d7a50befaea33c0f
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4kxUMACgkQHB6c3gNBRYehcQCfcOPigGhq9xtWUFeOvZHwoFSA
-2iwAn3yqL1aoZ5Lnvraf0ZDDV8+SQPNK
-=ckAX
+iEYEARECAAYFAk4oFKYACgkQHB6c3gNBRYfUbgCeMjCWUtYoF2XeNCyMW4UiS3qk
+a4gAoJnL8bHVNpF0lDd6jwibRtp/OSSF
+=wgUe
 -----END PGP SIGNATURE-----
diff --git a/dev-util/dmake/dmake-4.11-r1.ebuild b/dev-util/dmake/dmake-4.11-r1.ebuild
deleted file mode 100644
index 97939cd26b68..000000000000
--- a/dev-util/dmake/dmake-4.11-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dmake/dmake-4.11-r1.ebuild,v 1.3 2011/07/18 23:46:31 scarabeus Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Improved make"
-HOMEPAGE="http://tools.openoffice.org/dmake/"
-SRC_URI="http://tools.openoffice.org/${PN}/${P/-/_}.zip"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="
-	app-arch/unzip
-	sys-apps/groff
-"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -i unix/linux/gnu/make.sh \
-		-e "s/gcc/$(tc-getCC) ${CFLAGS}/g" \
-		-e "s|-O\( -o dmake\)|${LDFLAGS}\1|g" \
-		|| die "sed failed"
-	sed -i -e "s|\$(DMAKEROOT)|\$(ROOTDIR)/usr/share/dmake/startup|" \
-		unix/startup.h || die "sed failed" #360323
-}
-
-src_compile() {
-	sh unix/linux/gnu/make.sh || die "sh unix/linux/gnu/make.sh failed"
-}
-
-src_install () {
-	dobin dmake || die "dobin failed"
-	newman man/dmake.tf dmake.1 || die "newman failed"
-
-	insinto /usr/share/dmake/startup
-	doins -r startup/{{startup,config}.mk,unix} || die "doins failed"
-}
diff --git a/dev-util/dmake/dmake-4.11.ebuild b/dev-util/dmake/dmake-4.11.ebuild
deleted file mode 100644
index 616eb6cef4ea..000000000000
--- a/dev-util/dmake/dmake-4.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dmake/dmake-4.11.ebuild,v 1.2 2011/06/13 22:08:54 jer Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Improved make"
-HOMEPAGE="http://tools.openoffice.org/dmake/"
-SRC_URI="http://tools.openoffice.org/${PN}/${P/-/_}.zip"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="
-	app-arch/unzip
-	sys-apps/groff
-"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -i unix/linux/gnu/make.sh \
-		-e "s/gcc/$(tc-getCC) ${CFLAGS}/g" \
-		-e "s|-O\( -o dmake\)|${LDFLAGS}\1|g" \
-		|| die "sed failed"
-}
-
-src_compile() {
-	sh unix/linux/gnu/make.sh || die "sh unix/linux/gnu/make.sh failed"
-}
-
-src_install () {
-	dobin dmake || die "dobin failed"
-	newman man/dmake.tf dmake.1 || die "newman failed"
-
-	insinto /usr/share/dmake/startup
-	doins -r startup/{{startup,config}.mk,unix} || die "doins failed"
-}
diff --git a/dev-util/dmake/dmake-4.12.ebuild b/dev-util/dmake/dmake-4.12.ebuild
new file mode 100644
index 000000000000..ccd5fb0ef39d
--- /dev/null
+++ b/dev-util/dmake/dmake-4.12.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dmake/dmake-4.12.ebuild,v 1.1 2011/07/21 11:59:53 scarabeus Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Improved make"
+HOMEPAGE="http://tools.openoffice.org/dmake/"
+SRC_URI="mirror://debian/pool/main/d/dmake/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="
+	app-arch/unzip
+	sys-apps/groff
+"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-fix-overlapping-stcpys.patch"
+}
+
+src_install () {
+	default
+	newman man/dmake.tf dmake.1
+}
diff --git a/dev-util/dmake/files/4.12-fix-overlapping-stcpys.patch b/dev-util/dmake/files/4.12-fix-overlapping-stcpys.patch
new file mode 100644
index 000000000000..b79a53ba0eb8
--- /dev/null
+++ b/dev-util/dmake/files/4.12-fix-overlapping-stcpys.patch
@@ -0,0 +1,233 @@
+diff -ru dmake.orig/rulparse.c dmake/rulparse.c
+--- dmake.orig/rulparse.c	2009-07-29 13:31:47.000000000 +0100
++++ dmake/rulparse.c	2009-07-29 13:32:09.000000000 +0100
+@@ -897,7 +897,7 @@
+ 	 /* Handle %-targets. */
+ 	 CELLPTR cur;
+ 	 CELLPTR tpq = NIL(CELL);
+-	 CELLPTR nprq;
++	 CELLPTR nprq = NULL;
+ 
+ #ifdef DBUG
+ 	 DB_PRINT( "%", ("Handling %%-target [%s : : <prerequisites follow, maybe empty>]",
+@@ -915,7 +915,8 @@
+ 
+ 	    if( *name == '\'' && name[len-1]=='\'' ){
+ 	       name[len-1] = '\0';
+-	       strcpy(name,name+1);
++	       len = strlen(name+1)+1;
++	       memmove(name,name+1,len);
+ 	       /* add indirect prerequisite */
+ 	       _add_indirect_prereq( cur );
+ 	    }
+diff -ru dmake.orig/dag.c dmake/dag.c
+--- dmake.orig/dag.c	2009-08-07 20:18:31.000000000 +0100
++++ dmake/dag.c	2009-08-07 20:30:59.000000000 +0100
+@@ -369,14 +369,17 @@
+ 	 /* strip out any \<nl> combinations where \ is the current
+ 	  * CONTINUATION char */
+ 	 for(p=q; (p=strchr(p,CONTINUATION_CHAR))!=NIL(char); )
+-	    if( p[1] == '\n' )
+-	       strcpy( p, p+2 );
++	    if( p[1] == '\n' ) {
++	       size_t len = strlen(p+2)+1;
++	       memmove ( p, p+2, len );
++	    }
+ 	    else
+ 	       p++;
+ 
+ 	 p = DmStrSpn(q ," \t");	/* Strip white space before ... */
+ 	 if( p != q ) {
+-	    strcpy( q, p);
++	    size_t len = strlen(p)+1;
++	    memmove( q, p, len );
+ 	    p = q;
+ 	 }
+ 
+diff -ru dmake.orig/expand.c dmake/expand.c
+--- dmake.orig/expand.c	2009-08-07 20:18:34.000000000 +0100
++++ dmake/expand.c	2009-08-07 20:42:40.000000000 +0100
+@@ -230,6 +230,7 @@
+ char *tok;
+ {
+    if( strchr( "\"\\vantbrf01234567", tok[1] ) ) {
++      size_t len;
+       switch( tok[1] ) {
+ 	 case 'a' : *tok = 0x07; break;
+ 	 case 'b' : *tok = '\b'; break;
+@@ -246,13 +247,15 @@
+ 	    register int j = 0;
+ 	    for( ; i<2 && isdigit(tok[2]); i++ ) {
+ 	       j = (j << 3) + (tok[1] - '0');
+-	       strcpy( tok+1, tok+2 );
++	       len = strlen(tok+2)+1;
++	       memmove( tok+1, tok+2, len );
+ 	    }
+ 	    j = (j << 3) + (tok[1] - '0');
+ 	    *tok = j;
+ 	 }
+       }
+-      strcpy( tok+1, tok+2 );
++      len = strlen(tok+2)+1;
++      memmove( tok+1, tok+2, len );
+    }
+ }
+ 
+@@ -365,7 +368,8 @@
+       if( (e = Basename(s)) != s) {
+ 	 if( !(mod & DIRECTORY_FLAG) ) {
+ 	    /* Move the basename to the start. */
+-	    strcpy(s, e);
++	    size_t len = strlen(e)+1;
++	    memmove(s, e, len);
+ 	 }
+ 	 else
+ 	    s = e;
+@@ -382,7 +386,8 @@
+ 
+       if( !(mod & FILE_FLAG) ) {
+ 	 /* Move the suffix to the start. */
+-	 strcpy( s, e );
++	 size_t len = strlen(e)+1;
++         memmove(s, e, len);
+       }
+       else
+ 	 s = e;
+@@ -725,8 +730,10 @@
+ 	      done = !lev;
+ 	      break;
+             } else {
++              size_t len;
+ 	      s[1] = ' ';
+-	      strcpy( s, s+1 );
++              len = strlen(s+1)+1;
++	      memmove( s, s+1, len );
+ 	    }
+ 	    /*FALLTHRU*/
+ 	 case ' ':
+@@ -835,8 +842,10 @@
+        * converted them to a real space. Let's verify this. */
+       for( p=s; *p && *p != edelim && *p; p++ ) {
+ 	if( p[0] == '\\' && p[1] == '\n' ) {
++	  size_t len;
+ 	  p[1] = ' ';
+-	  strcpy( p, p+1 );
++	  len = strlen(p+1)+1;
++	  memmove( p, p+1, len );
+ 	}
+       }
+       if( !*p )
+@@ -1120,7 +1129,10 @@
+       *flag = 1;
+       res   = Expand( start );
+ 
+-      if( (t = DmStrSpn( res, " \t" )) != res ) strcpy( res, t );
++      if( (t = DmStrSpn( res, " \t" )) != res ) {
++          size_t len = strlen(t)+1;
++          memmove( res, t, len );
++      }
+    }
+ 
+    FREE( start );       /* this is ok! start is assigned a DmSubStr above */
+diff -ru dmake.orig/getinp.c dmake/getinp.c
+--- dmake.orig/getinp.c	2009-08-07 20:18:31.000000000 +0100
++++ dmake/getinp.c	2009-08-07 20:27:08.000000000 +0100
+@@ -169,7 +169,8 @@
+ 	  * text lines on input.  The maximum size of this is governened by
+ 	  * Buffer_size */
+ 	    if( q != p && q[-1] == CONTINUATION_CHAR ) {
+-	       strcpy( q, q+1 );
++	       size_t len = strlen(q+1)+1;
++	       memmove( q, q+1, len );
+ 	       q--;
+ 	       cont = FALSE;
+ 	    }
+@@ -290,7 +291,8 @@
+    while( (c = strchr(c, COMMENT_CHAR)) != NIL(char) ) {
+       if( Comment || State == NORMAL_SCAN )
+ 	 if( c != str && c[-1] == ESCAPE_CHAR ) {
+-	    strcpy( c-1, c );        /* copy it left, due to \# */
++	    size_t len = strlen(c)+1;
++	    memmove( c-1, c, len );  /* copy it left, due to \# */
+ 	    if( pend ) (*pend)--;    /* shift tail pointer left */
+ 	 }
+ 	 else {
+diff -ru dmake.orig/path.c dmake/path.c
+--- dmake.orig/path.c	2009-08-07 20:18:31.000000000 +0100
++++ dmake/path.c	2009-08-07 20:41:30.000000000 +0100
+@@ -172,6 +172,7 @@
+    char *tpath;
+    int hasdriveletter = 0;
+    int delentry;
++   size_t len;
+ 
+    DB_ENTER( "Clean_path" );
+ 
+@@ -231,14 +232,16 @@
+ 	    p++;
+ 	 }
+ 	 while( *p == *DirSepStr);
+-	 strcpy(t+1,p);
++	 len = strlen(p)+1;
++	 memmove(t+1,p,len);
+ 	 continue;
+       }
+ 
+       /* Remove './'. If OOODMAKEMODE is set do this only if it is not at
+        * the start of the path. */
+       if ( p-q == 1 && *q == '.' && (q != path || !STOBOOL(OOoDmMode)) ) {
+-	 strcpy(q,p+1);
++	 len = strlen(p+1)+1;
++	 memmove(q,p+1,len);
+ 	 q = tpath;
+ 	 continue;
+       }
+@@ -268,7 +271,8 @@
+ 	 }
+ 	 while( *t == *DirSepStr);
+ 	 /* q points to first letter of the current directory/file. */
+-	 strcpy(q,t);
++	 len = strlen(t)+1;
++	 memmove(q,t,len);
+ 	 q = tpath;
+       }
+       else
+--- dmake.orig/make.c	2009-08-08 09:56:10.000000000 +0100
++++ dmake/make.c	2009-08-08 10:00:04.000000000 +0100
+@@ -1352,8 +1352,10 @@
+        * Nothing in Expand() should be able to change dynamic macros. */
+       cmnd = Expand( rp->st_string );
+ 
+-      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
+-	 strcpy(cmnd,p);
++      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
++	 size_t len = strlen(p)+1;
++	 memmove(cmnd,p,len);
++      }
+ 
+       /* COMMAND macro is set to "$(CMNDNAME) $(CMNDARGS)" by default, it is
+        * possible for the user to reset it to, for example
+@@ -1381,8 +1383,10 @@
+ 	 shell  = ((l_attr & A_SHELL) != 0);
+ 
+ 	 /* clean up the attributes that we may have just added. */
+-	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
+-	    strcpy(cmnd,p);
++	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
++	    size_t len = strlen(p)+1;
++	    memmove(cmnd,p,len);
++	 }
+       }
+ 
+ #if defined(MSDOS)
+@@ -1477,8 +1481,9 @@
+    for( p=cmnd; *(n = DmStrPbrk(p,tmp)) != '\0'; )
+       /* Remove the \<nl> sequences. */
+       if(*n == CONTINUATION_CHAR && n[1] == '\n') {
++	 size_t len = strlen(n+2)+1;
+ 	 DB_PRINT( "make", ("fixing [%s]", p) );
+-	 strcpy( n, n+2 );
++	 memmove( n, n+2, len );
+ 	 p = n;
+       }
+       /* Look for an escape sequence and replace it by it's corresponding