Cleanup due #473480

(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 7 insertions, 191 deletions

diff --git a/dev-lang/tinycobol/ChangeLog b/dev-lang/tinycobol/ChangeLog
index a4f3b45ab1c5..8452ff328abe 100644
--- a/dev-lang/tinycobol/ChangeLog
+++ b/dev-lang/tinycobol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/tinycobol
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/ChangeLog,v 1.22 2012/03/01 19:53:02 ranger Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/ChangeLog,v 1.23 2013/07/21 09:36:16 pacho Exp $
+
+  21 Jul 2013; Pacho Ramos <pacho@gentoo.org> -files/tinycobol-0.64.patch,
+  -tinycobol-0.64.ebuild, metadata.xml:
+  Cleanup due #473480
 
   01 Mar 2012; Brent Baude <ranger@gentoo.org> tinycobol-0.65.9.ebuild:
   Marking tinycobol-0.65.9 ppc for bug 384499
@@ -90,4 +94,3 @@
 
   12 May 2003; Patrick Kursawe <phosphan@gentoo.org> tinycobol-0.60.ebuild:
   Initial import, suggestion by Rigo Ketelings <rigo@home.nl> in bug 15686
-
diff --git a/dev-lang/tinycobol/files/tinycobol-0.64.patch b/dev-lang/tinycobol/files/tinycobol-0.64.patch
deleted file mode 100644
index b125ca288efe..000000000000
--- a/dev-lang/tinycobol/files/tinycobol-0.64.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-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@
- 
- #
---- tinycobol-0.64/compiler/Makefile.in	2009-07-17 19:46:28.000000000 +0200
-+++ tinycobol-0.64/compiler/Makefile.in.new	2009-07-17 20:13:04.000000000 +0200
-@@ -78,14 +78,16 @@
- #	strip $@
- 
- 
--scan.c: scan.l
-+scan.c: scan.l htcobol.tab.c
- 	$(LEX) -o$@ $< 
- 
--htcobol.tab.c: htcobol.y scan.c
-+htcobol.tab.c: htcobol.y
- 	$(YACC) -dv -b htcobol $<  
- 
- #htcobgen.o: htcoboly.h htcobol.c
- 
-+reswords.o: htcobol.tab.c reswords.c
-+
- htcobol.o: htcoboly.h
- 	$(CCX) $(CCXFLAGS) -c htcobol.c
- 
---- tinycobol-0.64/Makefile.in	2009-07-17 19:35:54.000000000 +0200
-+++ tinycobol-0.64/Makefile.in.new	2009-07-17 20:14:42.000000000 +0200
-@@ -44,7 +44,7 @@
- all:
- 	@for i in ${subdirs}; do \
- 		echo Making all in $$i ; \
--		(cd $$i; ${MAKE} all) ; \
-+		(cd $$i; ${MAKE} all) || exit ; \
- 	done
- 
- install: all
diff --git a/dev-lang/tinycobol/metadata.xml b/dev-lang/tinycobol/metadata.xml
index 5ff8c1272cbc..ff62877c67ae 100644
--- a/dev-lang/tinycobol/metadata.xml
+++ b/dev-lang/tinycobol/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-  <email>phosphan@gentoo.org</email>
-  <description>Included package on user request, free for adoption.</description>
+  <email>maintainer-needed@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/dev-lang/tinycobol/tinycobol-0.64.ebuild b/dev-lang/tinycobol/tinycobol-0.64.ebuild
deleted file mode 100644
index cf253cf2f484..000000000000
--- a/dev-lang/tinycobol/tinycobol-0.64.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 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.6 2010/04/16 18:48:02 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="ppc x86"
-
-RDEPEND=">=dev-libs/glib-2.0
-	sys-libs/db"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	<sys-devel/bison-2.4"
-
-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
-	rm -rf "${D}/usr/man" # empty dir, see bug #315401
-}