[gentoo-commits] repo/gentoo:master commit in: app-text/csvfix/, app-text/csvfix/files/, profiles/

["Sam James" <sam@gentoo.org>]

commit:     8c73dc60ed2c4ad6dbbc95b96aece7753090cb31
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Feb 24 20:46:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 23:58:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c73dc60

app-text/csvfix: Remove last-rited pkg

Closes: https://bugs.gentoo.org/744013
Closes: https://bugs.gentoo.org/739786

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/csvfix/Manifest                           |  2 -
 app-text/csvfix/csvfix-1.6.ebuild                  | 50 ----------------
 app-text/csvfix/files/csvfix-1.10a-tests.patch     | 51 ----------------
 app-text/csvfix/files/csvfix-1.6-makefile.patch    | 69 ----------------------
 .../csvfix/files/csvfix-1.6-shuffle-test.patch     | 20 -------
 app-text/csvfix/metadata.xml                       |  8 ---
 profiles/package.mask                              |  5 --
 7 files changed, 205 deletions(-)

diff --git a/app-text/csvfix/Manifest b/app-text/csvfix/Manifest
deleted file mode 100644
index 76e235609d2..00000000000
--- a/app-text/csvfix/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST csvfix-1.6.tar.bz2 322530 BLAKE2B 8bda635a5182b31efe2c5c6613baaea13fe2f5c32f97c2bcbdaf05447103507c46190557f0a07e46aa0f442a6ed6b63b0d46d9759e5ddb2b19f00a31a38ddcce SHA512 abd525cff11e6dc4e59f5b26d57b2327564327e27009bbf777a6d83a6f8e474415b4448408aa162c6fb20b9a5bbaf970bdca23d8a9d7e31c3b8aaa19cd878035
-DIST csvfix_man_html_160.zip 403468 BLAKE2B 8007ca95891a99926f6c2968a73ddc30211ff07017261583664dc44ac84a508d097cb4acb81529891caa2f98ca4f094565f46cfa9d79e0d99df92ffd5acc908e SHA512 868047ca4eef7bbbf3735f25489c72820465c414af2ffa11fd3e61fd45ca80661d73082a90b94c4503876bb2355a6b3751f8ede862744f0d7223e77ae770ccd5

diff --git a/app-text/csvfix/csvfix-1.6.ebuild b/app-text/csvfix/csvfix-1.6.ebuild
deleted file mode 100644
index 8f35d453676..00000000000
--- a/app-text/csvfix/csvfix-1.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs versionator vcs-snapshot eutils
-
-MY_PV="$(delete_all_version_separators)"
-DESCRIPTION="A stream editor for manipulating CSV files"
-HOMEPAGE="https://neilb.bitbucket.org/csvfix/ https://bitbucket.org/neilb/csvfix/"
-SRC_URI="https://bitbucket.org/neilb/csvfix/get/version-${PV}.tar.bz2 -> ${P}.tar.bz2
-	doc? ( https://bitbucket.org/neilb/csvfix/downloads/csvfix_man_html_${MY_PV}0.zip )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-makefile.patch
-	"${FILESDIR}"/${PN}-1.10a-tests.patch
-	"${FILESDIR}"/${P}-shuffle-test.patch
-)
-
-src_prepare() {
-	default
-	edos2unix $(find csvfix/tests -type f)
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" AR="$(tc-getAR)" lin
-}
-
-src_test() {
-	cd ${PN}/tests
-	chmod +x run1 runtests
-	./runtests || die "tests failed"
-}
-
-src_install() {
-	dobin csvfix/bin/csvfix
-	if use doc; then
-		docinto html
-		dodoc -r "${WORKDIR}"/${PN}${MY_PV}/*
-	fi
-}

diff --git a/app-text/csvfix/files/csvfix-1.10a-tests.patch b/app-text/csvfix/files/csvfix-1.10a-tests.patch
deleted file mode 100644
index 8e4461d85a3..00000000000
--- a/app-text/csvfix/files/csvfix-1.10a-tests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- csvfix-build.orig/csvfix/tests/run1
-+++ csvfix-build/csvfix/tests/run1
-@@ -1,4 +1,4 @@
--#!bash
-+#!/bin/bash
- # run1
- # run single test
- # copyright (C) 2008 Neil Butterworth
-@@ -49,7 +49,7 @@
- fi
- 
- # exe to be tested - used in tests
--CSVED=../bin/csvfix.exe
-+CSVED=../bin/csvfix
- export CSVED
- 
- if [ ! -f "$CSVED" ]
-@@ -64,7 +64,7 @@
- fi
- 
- # where to find diff & where to put output
--DIFF=/bin/diff
-+DIFF=/usr/bin/diff
- DIFFOUT=tmp/_diffout
- WINDIFF="C:/Program Files/Microsoft Visual Studio/Common/Tools/WINDIFF.EXE"
- TEST=`basename $TEST`
-@@ -133,5 +133,7 @@
- 	fi
- else
- 	echo "Execution problem with $TEST - please correct"
-+	color_red "FAILED $TEST"
-+	exit 1
- fi
- 
---- csvfix-build.orig/csvfix/tests/runtests
-+++ csvfix-build/csvfix/tests/runtests
-@@ -1,4 +1,4 @@
--#!bash
-+#!/bin/bash
- # runall.bash
- # run all tests and report
- 
-@@ -22,3 +22,8 @@
- echo $FAILS failed, $PASSES passed
- echo ""
- 
-+if [[ $FAILS -gt 0 ]]; then
-+	exit 1
-+else
-+	exit 0
-+fi

diff --git a/app-text/csvfix/files/csvfix-1.6-makefile.patch b/app-text/csvfix/files/csvfix-1.6-makefile.patch
deleted file mode 100644
index aaee2aa003f..00000000000
--- a/app-text/csvfix/files/csvfix-1.6-makefile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- neilb-csvfix-e804a794d175/alib/Makefile
-+++ neilb-csvfix-e804a794d175/alib/Makefile
-@@ -2,12 +2,12 @@
- # Copyright (C) 2009 Neil Butterworth
- 
- OUT = lib/alib.a
-+AR = ar
- CCTYPE = gcc
- IDIR = inc
- ODIR = obj
--XDIR = expat
- SDIR = src
--INC = -Iinc -Iexpat
-+INC = -Iinc
- 
- cc.gcc = g++
- cc.clang = clang++ -std=c++11 -stdlib=libc++  
-@@ -26,9 +26,6 @@
- _WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o
- WINOBJS = $(patsubst %,$(ODIR)/%,$(_WINOBJS))
- 
--_EXPAT = xmlparse.o  xmlrole.o  xmltok.o  xmltok_impl.o  xmltok_ns.o
--EXPAT = $(patsubst %,$(ODIR)/%,$(_EXPAT))
--
- $(ODIR)/%.o: $(SDIR)/%.cpp $(IDIR)/%.h 
- 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 
- 
-@@ -36,10 +33,10 @@
- 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 
- 
- win: $(OBJS) $(EXPAT) $(WINOBJS)
--	ar rvs $(OUT) $^
-+	$(AR) rvs $(OUT) $^
- 
- lin: $(OBJS) $(EXPAT) 
--	ar rvs $(OUT) $^
-+	$(AR) rvs $(OUT) $^
- 
- .PHONY: clean
- clean:
---- neilb-csvfix-e804a794d175/csvfix/Makefile
-+++ neilb-csvfix-e804a794d175/csvfix/Makefile
-@@ -22,7 +22,7 @@
- 
- ALIB = ../alib/lib/alib.a
- WINLIBS = ../alib/lib/alib.a -lodbc32 
--LINLIBS = ../alib/lib/alib.a 
-+LINLIBS = ../alib/lib/alib.a -lexpat
- 
- _OBJS = csved_atable.o \
- 		csved_block.o \
-@@ -99,8 +99,7 @@
- 	strip $(WINOUT)
- 
- $(LINOUT): $(OBJS) $(ALIB)
--	$(CC) -o $@ $^ $(LINLIBS)
--	strip $(LINOUT)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)
- 
- .PHONY: win
- win:
---- neilb-csvfix-e804a794d175/Makefile
-+++ neilb-csvfix-e804a794d175/Makefile
-@@ -1,3 +1,5 @@
-+CFLAGS += -std=c++11
-+
- ifndef COMSPEC
- 	CLEAN =	(cd alib; $(MAKE) clean) && (cd csvfix; $(MAKE) clean) 
- else

diff --git a/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch b/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch
deleted file mode 100644
index 3916e92e059..00000000000
--- a/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix the expected data output for the shuffle test.
-
---- a/csvfix/tests/correct/shuffle.test
-+++ b/csvfix/tests/correct/shuffle.test
-@@ -5,10 +5,10 @@
- "Oscar","Wilde","M"
- "Charles","Dickens","M"
- "George","Elliot","F"
--"Charles","Dickens","M"
--"Austen","F","Jane"
-+"Charles","M","Dickens"
-+"Jane","F","Austen"
- "Herman","M","Melville"
- "M","Flann","O'Brien"
--"Elliot","George","F"
--"Virginia","Woolf","F"
--"M","Wilde","Oscar"
-+"George","F","Elliot"
-+"Woolf","F","Virginia"
-+"Wilde","M","Oscar"

diff --git a/app-text/csvfix/metadata.xml b/app-text/csvfix/metadata.xml
deleted file mode 100644
index bf239db74a9..00000000000
--- a/app-text/csvfix/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="bitbucket">neilb/csvfix</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 022ca2fb4ba..12f3ef78930 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -207,11 +207,6 @@ dev-libs/libressl
 # Removal in 30 days. Bug #744019
 sys-power/ncpufreqd
 
-# Azamat H. Hackimov <azamat.hackimov@gmail.com> (2021-01-26)
-# Dead upstream, no live HOMEPAGE and SRC_URI.
-# Removal in 30 days. Bug #744013
-app-text/csvfix
-
 # Marek Szuba <marecki@gentoo.org> (2021-01-21)
 # Masked for testing and further work - the golang-vcs-snapshot variant
 # seems to be incompatible with revdeps using go-module, the variant