From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- app-text/csvfix/Manifest | 7 --- 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 --- 6 files changed, 205 deletions(-) delete mode 100644 app-text/csvfix/Manifest delete mode 100644 app-text/csvfix/csvfix-1.6.ebuild delete mode 100644 app-text/csvfix/files/csvfix-1.10a-tests.patch delete mode 100644 app-text/csvfix/files/csvfix-1.6-makefile.patch delete mode 100644 app-text/csvfix/files/csvfix-1.6-shuffle-test.patch delete mode 100644 app-text/csvfix/metadata.xml (limited to 'app-text/csvfix') diff --git a/app-text/csvfix/Manifest b/app-text/csvfix/Manifest deleted file mode 100644 index b964ba61bc54..000000000000 --- a/app-text/csvfix/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX csvfix-1.10a-tests.patch 1004 BLAKE2B 3b7c1b133ccf4a38bd8be053498c61b0d34c699d9400d5100f07cebc17f235a3510dcde21caa42775681a0f47023d0ad51b9282ffb28a6fc798c71863ad19564 SHA512 3f2330d44872cb022f9f0d9ef9f3bf43d27da94d53ec306d84d56c6d5cf6bbd2afbfa710872cb7a144caeefcf90ce7837422fc421bee30a0af78bdef7d991383 -AUX csvfix-1.6-makefile.patch 1604 BLAKE2B d8f012a3f02c513f8b26e8fa5c7e805a0d333623a7018fadde5c6fea76bd2dd0582587e5aeedd990a71924dd2beba43e5d36c9332f2b257841536e4de8357433 SHA512 f1f5cf1e2d1b7d5d3031ff27fa570ec501af38e9340e8d00be62bee1a46afb9e2941de6d40644d7f5d1326abd8d94036bfc5b04d4fad0e5dba15faaaa22b66dc -AUX csvfix-1.6-shuffle-test.patch 510 BLAKE2B 4eebe2755d8f42838d4cd9da3a1c2eb1a448c3f978a1c77e625b4937469428a762ac2ac255d9b85944b6dac8513c2316fe1ab876a1a2a1bce89959b6c7e4ed18 SHA512 322812af5799b4e7538e76cde1c39e96ec4494e8db1df6fa2f7b8ed1fc16915cc259dd793ee06682d1520bc47659ca043afdaa749868c8a82f1dab27f76f5efb -DIST csvfix-1.6.tar.bz2 322530 BLAKE2B 8bda635a5182b31efe2c5c6613baaea13fe2f5c32f97c2bcbdaf05447103507c46190557f0a07e46aa0f442a6ed6b63b0d46d9759e5ddb2b19f00a31a38ddcce SHA512 abd525cff11e6dc4e59f5b26d57b2327564327e27009bbf777a6d83a6f8e474415b4448408aa162c6fb20b9a5bbaf970bdca23d8a9d7e31c3b8aaa19cd878035 -DIST csvfix_man_html_160.zip 403468 BLAKE2B 8007ca95891a99926f6c2968a73ddc30211ff07017261583664dc44ac84a508d097cb4acb81529891caa2f98ca4f094565f46cfa9d79e0d99df92ffd5acc908e SHA512 868047ca4eef7bbbf3735f25489c72820465c414af2ffa11fd3e61fd45ca80661d73082a90b94c4503876bb2355a6b3751f8ede862744f0d7223e77ae770ccd5 -EBUILD csvfix-1.6.ebuild 1122 BLAKE2B 0a3ff9921ea152f6546e2f42ee6d6e9e7255621e6f1f66e6d7b98fd64b34c2a269e1b7c51e9099a40d402e5fe82efb9320c076f9de9d1679eb6ecd3933cc2fd1 SHA512 faec708a59bcd6b58d273f93ba0cf65bbd7a1d8f68ae75eb8f49140fa2a8a517bc397c257761095e45c412e780d051e66408b93fc54a48ac7bbb309edaa08603 -MISC metadata.xml 252 BLAKE2B 550701bcf88de4d6d9fc7099f64a700032452f802247f7d9341fceaf59f7d5309ca25242a2c4c113d31535916d30884f25f262af7d493cb39f2b275bd413f07e SHA512 5e8f83c84d6f165eec92cf9d91db84c050c9bab6d68a5ed3fe6a6cd47794bd206be2ca8facb6436d07a23e9d2f4d2a38d17d67155c351d65a03bdebd5a963541 diff --git a/app-text/csvfix/csvfix-1.6.ebuild b/app-text/csvfix/csvfix-1.6.ebuild deleted file mode 100644 index 8f35d4536767..000000000000 --- 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 8e4461d85a31..000000000000 --- 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 aaee2aa003f7..000000000000 --- 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 3916e92e0592..000000000000 --- 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 bf239db74a96..000000000000 --- a/app-text/csvfix/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - neilb/csvfix - - -- cgit v1.2.3