Version bump + a few hacks to get the paths the way we want them and to eliminate pre-stripping. This should solve bugs #243894, #246658, #240236 and #240218.

Package-Manager: portage-2.1.4.5

6 files changed, 178 insertions, 15 deletions

diff --git a/dev-lang/tinycobol/ChangeLog b/dev-lang/tinycobol/ChangeLog
index 3be244074492..6ae0903be9fe 100644
--- a/dev-lang/tinycobol/ChangeLog
+++ b/dev-lang/tinycobol/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/tinycobol
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/ChangeLog,v 1.12 2007/02/26 12:57:20 phosphan Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/ChangeLog,v 1.13 2008/12/08 22:54:43 phosphan Exp $
+
+*tinycobol-0.64 (08 Dec 2008)
+
+  08 Dec 2008; Patrick Kursawe <phosphan@gentoo.org>
+  +files/tinycobol-0.64.patch, +tinycobol-0.64.ebuild:
+  Version bump + a few hacks to get the paths the way we want them and to
+  eliminate pre-stripping. This should solve bugs #243894, #246658, #240236
+  and #240218.
 
 *tinycobol-0.63 (26 Feb 2007)
 
diff --git a/dev-lang/tinycobol/Manifest b/dev-lang/tinycobol/Manifest
index 85093dfd8eaa..a31eb13ba8fb 100644
--- a/dev-lang/tinycobol/Manifest
+++ b/dev-lang/tinycobol/Manifest
@@ -1,8 +1,11 @@
 AUX tinycobol-0.61.patch 1441 RMD160 61373453c29c05bdcf5cca3c8e07beba095fdff0 SHA1 2aa19108be5b2c06106523a7a82aef63dc0cae84 SHA256 14856dfe7bf04a5608c8250075c9e747a6e5aeddade83b2a2b549856eaa16e75
 AUX tinycobol-0.63.patch 384 RMD160 d948a11c316f2d3f0dec990b24ca775ddeb35279 SHA1 8fc482660c45af2b5b153a9c9d4c29c9ff877834 SHA256 28bc83752511012a550135b7661532b819f49595554424cb2fa82c6b8708b22d
+AUX tinycobol-0.64.patch 3526 RMD160 e1139bf6bde9a2d94cd4ea434784b1f9c4773817 SHA1 ebed5090bc14df83fed991915e1c6faeed7ac44c SHA256 8f5e74172a799e9408f49281886a72b9e7f347299a0bc335bb634aceaa8ea29c
 DIST tinycobol-0.61.tar.gz 817294 RMD160 4cdc6ed420cc73ef427f111c382cc76a20a54056 SHA1 f88317ac6b0553f301bf86d7c606ada620187042 SHA256 0105b5ef3c9fe42c3052d97b905fc65a59c43f9a122d0b53b0138f3e7e1daa56
 DIST tinycobol-0.63.tar.gz 847010 RMD160 388c03e28b6c8bee00694dc543c0fa8e50fe6c1e SHA1 279aec84d37dcacfe6855082bccb2af1a1aee1e4 SHA256 7fac5e09b3c8b292957c6209df615d429f7c454859b4183cecff4c78978d4d22
-EBUILD tinycobol-0.61.ebuild 901 RMD160 f1f76bcef883f6cde99a63088f1f76d59a17f433 SHA1 971bebb6a27e1af861ada7cd80e53483ad712769 SHA256 b427e19da7d0102284fad7a5e4a526671405b800662bc67ea02ce48e0ee85270
-EBUILD tinycobol-0.63.ebuild 943 RMD160 09278de644d8754d84881bb54e08a5f4a3de47a6 SHA1 31de0fd59ca104737dd8c1d10d6adf9498d00592 SHA256 192581c762de1b621a60a82019b23031ab3e74c6ffad5e81c0426fbfd0123ea3
-MISC ChangeLog 1704 RMD160 f332fd2db7624f56379391a5797b63521fea0a19 SHA1 3503fba641f2596cb74323db60c9987849cb2f41 SHA256 384ae595d84ccb6a9dd41c767945a2352e4f02b0f62eb6a7d7f1d3d2bad0f4ff
+DIST tinycobol-0.64.tar.bz2 741132 RMD160 50bdb6c483afe972cd2c80476619aab686bdc448 SHA1 4c81e2d893eab1dee1c4b453ea5918169d965d2c SHA256 90d14ec5e1037a5d1b0ca8ff853a32c457c3116a1a9795906d32ca356957135d
+EBUILD tinycobol-0.61.ebuild 909 RMD160 7da26add29658b87c36e889eaf6e698c049248c6 SHA1 2225de2a59523a38688d92ebbcbdb17c07e525c7 SHA256 a9592f9648c5a50670a2f515899ba97ce9f9a75cce3d2c05f834288c1805985b
+EBUILD tinycobol-0.63.ebuild 949 RMD160 1c53d4d8b7634e709e37dec18794b3c2d410ee87 SHA1 4e3a288ece985bcdd91c941251ba30efdc2ca6a7 SHA256 dc877eae44c61352e40201b802b44a66521a214c7c31741bd28146bfa1d707e1
+EBUILD tinycobol-0.64.ebuild 1023 RMD160 f601767a7c498890384c29395f425faad3778a9b SHA1 03bff7a1b745272ce65c4ad576ee3da4a5f012d9 SHA256 22859090999e5110f1797bf3358069f7e70a193ea6c15fdc595f5842faf0d22c
+MISC ChangeLog 2009 RMD160 a0a75fa4629c2679a93e30ad08aa6c986fedb1fb SHA1 93cfe8b38cdc7bc0902a87a298236b69d83a97e4 SHA256 c362ce174f0fa98397962b0355b5e168fb2c2bebb36b973063880b575b9fabe9
 MISC metadata.xml 306 RMD160 52ac612aee5f80066b10b00c27f22cce31dbb33c SHA1 01a22424486ad8bf796c5f09a781286f5ec97e66 SHA256 5b8439d52ce555d439b479314ea3266c3a1929d22e6655e2952d52d32a88ac38
diff --git a/dev-lang/tinycobol/files/tinycobol-0.64.patch b/dev-lang/tinycobol/files/tinycobol-0.64.patch
new file mode 100644
index 000000000000..99734e162b53
--- /dev/null
+++ b/dev-lang/tinycobol/files/tinycobol-0.64.patch
@@ -0,0 +1,108 @@
+diff -Nru tinycobol-0.64/cobrun/Makefile.in tinycobol-0.64.new/cobrun/Makefile.in
+--- tinycobol-0.64/cobrun/Makefile.in	2008-10-30 08:52:49.000000000 +0100
++++ tinycobol-0.64.new/cobrun/Makefile.in	2008-12-08 23:08:00.000000000 +0100
+@@ -11,12 +11,12 @@
+ datarootdir = ${prefix}/share
+ pkgdatadir = ${datarootdir}/htcobol
+ #cobdir_docdir=@cobdir_docdir@
+-cobdir_docdir=${prefix}/doc/@cobdir_docdir@
++cobdir_docdir=${prefix}/share/doc/@cobdir_docdir@
+ 
+ INSTALL=@INSTALL@
+ INSTALL_DATA=@INSTALL_DATA@
+ INSTALL_DIR=$(INSTALL) -d -m 755 
+-INSTALL_PROGRAM=$(INSTALL) -s -m 755
++INSTALL_PROGRAM=$(INSTALL) -m 755
+ 
+ INSTBIN=@cobbin_default@
+ INSTRC=@cobdir_default@
+@@ -37,7 +37,7 @@
+ LIBS1=@htg_ld_args_defaults@
+ LIBS2=-L../lib -lhtcobol @htg_ld_args_defaults@
+ LDFLAGS=@LDFLAGS@
+-CCXFLAGS=${INCLUDES}
++CCXFLAGS=${CFLAGS} ${INCLUDES}
+ 
+ SRC01 = htcobrun.c
+ 
+diff -Nru tinycobol-0.64/compiler/Makefile.in tinycobol-0.64.new/compiler/Makefile.in
+--- tinycobol-0.64/compiler/Makefile.in	2008-10-30 08:52:49.000000000 +0100
++++ tinycobol-0.64.new/compiler/Makefile.in	2008-12-08 23:08:00.000000000 +0100
+@@ -13,12 +13,12 @@
+ datarootdir = ${prefix}/share
+ pkgdatadir = ${datarootdir}/htcobol
+ #cobdir_docdir=@cobdir_docdir@
+-cobdir_docdir=${prefix}/doc/@cobdir_docdir@
++cobdir_docdir=${prefix}/share/doc/@cobdir_docdir@
+ 
+ INSTALL=@INSTALL@
+ INSTALL_DATA=@INSTALL_DATA@
+ INSTALL_DIR=$(INSTALL) -d -m 755 
+-INSTALL_PROGRAM=$(INSTALL) -s -m 755
++INSTALL_PROGRAM=$(INSTALL) -m 755
+ 
+ RM= rm -f
+ MKDIR=mkdir -p
+@@ -38,7 +38,7 @@
+ # -DDEBUG_COMPILER -DDEBUG_SCANNER
+ #
+ INCLUDES=@INCLUDES@
+-CCXFLAGS=${INCLUDES} @CCXFLAGS@ -Wall -pedantic -Wno-long-long
++CCXFLAGS=${INCLUDES} ${CFLAGS} @CCXFLAGS@ -Wall -pedantic -Wno-long-long
+ #CCXFLAGS1=${INCLUDES} @CCXFLAGS@
+ CCXFLAGS1=${INCLUDES}
+ LIBS=@LIBS@
+diff -Nru tinycobol-0.64/info/Makefile.in tinycobol-0.64.new/info/Makefile.in
+--- tinycobol-0.64/info/Makefile.in	2008-10-30 08:52:49.000000000 +0100
++++ tinycobol-0.64.new/info/Makefile.in	2008-12-08 23:08:00.000000000 +0100
+@@ -16,15 +16,15 @@
+ #datadir = ${datarootdir}
+ datarootdir = ${prefix}/share
+ pkgdatadir = ${datarootdir}/htcobol
+-mandir = $(prefix)/man/man1
++mandir = $(prefix)/share/man/man1
+ 
+ #cobdir_docdir=@cobdir_docdir@
+-cobdir_docdir=${prefix}/doc/@cobdir_docdir@
++cobdir_docdir=${prefix}/share/doc/@cobdir_docdir@
+ 
+ INSTALL=@INSTALL@
+ INSTALL_DATA=@INSTALL_DATA@
+ INSTALL_DIR=$(INSTALL) -d -m 755 
+-INSTALL_PROGRAM=$(INSTALL) -s -m 755
++INSTALL_PROGRAM=$(INSTALL) -m 755
+ 
+ #mandir=@mandir@
+ #docdir=@docdir@
+diff -Nru tinycobol-0.64/lib/Makefile.in tinycobol-0.64.new/lib/Makefile.in
+--- tinycobol-0.64/lib/Makefile.in	2008-10-30 08:52:50.000000000 +0100
++++ tinycobol-0.64.new/lib/Makefile.in	2008-12-08 23:08:00.000000000 +0100
+@@ -9,7 +9,7 @@
+ datarootdir = ${prefix}/share
+ pkgdatadir = ${datarootdir}/htcobol
+ #cobdir_docdir=@cobdir_docdir@
+-cobdir_docdir=${prefix}/doc/@cobdir_docdir@
++cobdir_docdir=${prefix}/share/doc/@cobdir_docdir@
+ lib_dir=${exec_prefix}/lib
+ 
+ INSTRC=@cobdir_default@
+@@ -18,7 +18,7 @@
+ INSTALL=@INSTALL@
+ INSTALL_DATA=@INSTALL_DATA@
+ INSTALL_DIR=$(INSTALL) -d -m 755 
+-INSTALL_PROGRAM=$(INSTALL) -s -m 755
++INSTALL_PROGRAM=$(INSTALL) -m 755
+ 
+ RANLIB=@RANLIB@
+ AR=@AR@
+@@ -36,8 +36,8 @@
+ INCLUDES=@INCLUDES@
+ LIBS=@htg_ld_args_defaults@
+ LDFLAGS=@LDFLAGS@
+-CCXFLAGS=${INCLUDES} @CCXFLAGS@ -Wall 
+-CCXFLAGS1=${INCLUDES} @CCXFLAGS@ -Wall -fPIC -DPIC
++CCXFLAGS=${INCLUDES} ${CFLAGS} @CCXFLAGS@ -Wall 
++CCXFLAGS1=${INCLUDES} ${CFLAGS} @CCXFLAGS@ -Wall -fPIC -DPIC
+ ACXFLAGS=@ACXFLAGS@
+ 
+ #
diff --git a/dev-lang/tinycobol/tinycobol-0.61.ebuild b/dev-lang/tinycobol/tinycobol-0.61.ebuild
index ff3a1f98fbd4..44c7822f2908 100644
--- a/dev-lang/tinycobol/tinycobol-0.61.ebuild
+++ b/dev-lang/tinycobol/tinycobol-0.61.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/tinycobol-0.61.ebuild,v 1.7 2005/04/24 12:35:36 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/tinycobol-0.61.ebuild,v 1.8 2008/12/08 22:54:43 phosphan Exp $
 
 inherit eutils
 
@@ -18,8 +18,8 @@ DEPEND=">=dev-libs/glib-2.0
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}.patch
 }
 
 src_compile() {
@@ -34,7 +34,7 @@ src_install() {
 	dodir /usr/share/htcobol
 	make prefix="${D}/usr" install
 	dodoc AUTHORS ChangeLog README STATUS
-	cd ${D}/usr/lib
+	cd "${D}"/usr/lib
 	rm libhtcobol.so libhtcobol.so.0
 	ln -s libhtcobol.so.0.* libhtcobol.so.0
 	ln -s libhtcobol.so.0 libhtcobol.so
diff --git a/dev-lang/tinycobol/tinycobol-0.63.ebuild b/dev-lang/tinycobol/tinycobol-0.63.ebuild
index c3f2c9e04b78..eefb455e5b25 100644
--- a/dev-lang/tinycobol/tinycobol-0.63.ebuild
+++ b/dev-lang/tinycobol/tinycobol-0.63.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/tinycobol-0.63.ebuild,v 1.1 2007/02/26 12:57:20 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/tinycobol-0.63.ebuild,v 1.2 2008/12/08 22:54:43 phosphan Exp $
 
 inherit eutils
 
@@ -21,8 +21,8 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}.patch
 }
 
 src_compile() {
@@ -37,7 +37,7 @@ src_install() {
 	dodir /usr/share/htcobol
 	make prefix="${D}/usr" install
 	dodoc AUTHORS ChangeLog README STATUS
-	cd ${D}/usr/lib
+	cd "${D}"/usr/lib
 	rm libhtcobol.so libhtcobol.so.0
 	ln -s libhtcobol.so.0.* libhtcobol.so.0
 	ln -s libhtcobol.so.0 libhtcobol.so
diff --git a/dev-lang/tinycobol/tinycobol-0.64.ebuild b/dev-lang/tinycobol/tinycobol-0.64.ebuild
new file mode 100644
index 000000000000..ab4411d82bcb
--- /dev/null
+++ b/dev-lang/tinycobol/tinycobol-0.64.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/tinycobol-0.64.ebuild,v 1.1 2008/12/08 22:54:43 phosphan Exp $
+
+inherit eutils
+
+DESCRIPTION="COBOL for linux"
+HOMEPAGE="http://tiny-cobol.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tiny-cobol/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~x86 ~ppc"
+
+RDEPEND=">=dev-libs/glib-2.0
+	sys-libs/db"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}.patch
+}
+
+src_compile() {
+	econf || die
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+	dodir /usr/lib
+	dodir /usr/share/htcobol
+	dodir /usr/share/doc
+	emake DESTDIR="${D}" cobdir_docdir="/usr/share/doc/htcobol-${PV}" \
+			pkgdatadir="/usr/share/htcobol/" install
+	cd lib
+	emake DESTDIR="${D}" pkgdatadir="/usr/share/htcobol/" install \
+			install-shared-libs install-static-libs
+}