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

[Andrew Savchenko]

commit:     a8c1783461969de640a2a84a1a97425b68e4a927
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 09:48:08 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 09:50:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8c17834

app-text/sdcv: remove old

Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 app-text/sdcv/Manifest                             |  1 -
 app-text/sdcv/files/sdcv-0.4.2-crash.patch         | 27 -------------
 app-text/sdcv/files/sdcv-0.4.2-dash.patch          | 21 ----------
 app-text/sdcv/files/sdcv-0.4.2-g-handling.patch    | 21 ----------
 .../sdcv/files/sdcv-0.4.2-missing-headers.patch    | 47 ----------------------
 app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch  | 17 --------
 app-text/sdcv/sdcv-0.4.2.ebuild                    | 47 ----------------------
 7 files changed, 181 deletions(-)

diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index 88c46f6..1cadede 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,2 +1 @@
-DIST sdcv-0.4.2.tar.bz2 181384 SHA256 a164f079e93986814ea2d39f3a49cf9d1b71b01aad908254457fe3d0ded9deb2 SHA512 0c701a64893c7531006617e190924e292bd755c2a4c3905fa7ab44002bf189b5d2c7694f331356093a3b5e9f690f89e50bca29b9c36a9fb9733603d2aef1b58b WHIRLPOOL e605ee39a38e405ddae1b438a6714b5f9bc684097fe264f4bd124955a2f05c39e4c3140fb22526ca5dee51f61803740321d6c4143212b6450c17bf507e869a6c
 DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 SHA256 386cfc96285a653c697f8baeab676cb3f1645cea029464d194872d0bbae14ffb SHA512 e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570 WHIRLPOOL 0e9cb7eaf6ccee6f9c7dbebbfee4d4a80c1cdca7444f2ba6f276a670924395dcdabd4ee7efe929bd940f3b3accc01e425f0270c2d7c897bcbd4adc03fd566a05

diff --git a/app-text/sdcv/files/sdcv-0.4.2-crash.patch b/app-text/sdcv/files/sdcv-0.4.2-crash.patch
deleted file mode 100644
index 264cffc..0000000
--- a/app-text/sdcv/files/sdcv-0.4.2-crash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix unalligned access to buffer.
-
-On several architectures (arm, armel, sparc and ia64), unalligned access to
-integers is not allowed. Buffer in this function is not alligned at all and
-attempt to read integer from it causes crash of application on such
-architectures.
-
-Reported upstream at:
-https://sourceforge.net/tracker/index.php?func=detail&aid=2149388&group_id=122858&atid=694730
---- a/src/lib/lib.cpp
-+++ b/src/lib/lib.cpp
-@@ -496,9 +496,13 @@
- 		entries[i].keystr=p;
- 		len=strlen(p);
- 		p+=len+1;
--		entries[i].off=g_ntohl(*reinterpret_cast<guint32 *>(p));
-+        /*
-+         * Can not use typecasting here, because *data does not have
-+         * to be alligned and unalligned access fails on some architectures.
-+         */
-+		entries[i].off=((unsigned char)p[0] << 24) | ((unsigned char)p[1] << 16) | ((unsigned char)p[2] << 8) | (unsigned char)p[3];
- 		p+=sizeof(guint32);
--		entries[i].size=g_ntohl(*reinterpret_cast<guint32 *>(p));
-+		entries[i].size=((unsigned char)p[0] << 24) | ((unsigned char)p[1] << 16) | ((unsigned char)p[2] << 8) | (unsigned char)p[3];
- 		p+=sizeof(guint32);
- 	}
- }

diff --git a/app-text/sdcv/files/sdcv-0.4.2-dash.patch b/app-text/sdcv/files/sdcv-0.4.2-dash.patch
deleted file mode 100644
index 35d15ae..0000000
--- a/app-text/sdcv/files/sdcv-0.4.2-dash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/t_datadir b/tests/t_datadir
-index 116ae7e..327e5b5 100755
---- a/tests/t_datadir
-+++ b/tests/t_datadir
-@@ -1 +1 @@
--#!/bin/sh
-+#!/bin/bash
-diff --git a/tests/t_list b/tests/t_list
-index 42ae137..62e52fd 100755
---- a/tests/t_list
-+++ b/tests/t_list
-@@ -1 +1 @@
--#!/bin/sh
-+#!/bin/bash
-diff --git a/tests/t_utf8input b/tests/t_utf8input
-index 7ae88c4..e692ab0 100755
---- a/tests/t_utf8input
-+++ b/tests/t_utf8input
-@@ -1 +1 @@
--#!/bin/sh
-+#!/bin/bash

diff --git a/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch b/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch
deleted file mode 100644
index 72fb690..0000000
--- a/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://sourceforge.net/tracker/index.php?func=detail&aid=2125962&group_id=122858&atid=694730
-
-Fixes displaying of 'g' (gtk markup) entries.
---- a/src/libwrapper.cpp
-+++ b/src/libwrapper.cpp
-@@ -118,7 +118,6 @@
- 		switch (*p++) {
- 		case 'm':
- 		case 'l': //need more work...
--		case 'g':
- 			sec_size = strlen(p);
- 			if (sec_size) {
- 				res+="\n";
-@@ -128,6 +127,7 @@
- 			}
- 			sec_size++;
- 			break;
-+		case 'g':
- 		case 'x':
- 			sec_size = strlen(p);
- 			if (sec_size) {

diff --git a/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch b/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch
deleted file mode 100644
index 8c96c65..0000000
--- a/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur sdcv-0.4.2-orig/src/lib/lib.cpp sdcv-0.4.2/src/lib/lib.cpp
---- sdcv-0.4.2-orig/src/lib/lib.cpp	2009-07-25 17:44:48.000000000 -0400
-+++ sdcv-0.4.2/src/lib/lib.cpp	2009-07-25 17:39:11.000000000 -0400
-@@ -517,7 +517,7 @@
- {
- 	fseek(idxfile, wordoffset[page_idx], SEEK_SET);
- 	guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx];
--	fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
-+	fread(wordentry_buf, std::min(sizeof(wordentry_buf), (size_t)page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
- 	return wordentry_buf;
- }
- 
-diff -ur sdcv-0.4.2-orig/src/libwrapper.cpp sdcv-0.4.2/src/libwrapper.cpp
---- sdcv-0.4.2-orig/src/libwrapper.cpp	2009-07-25 17:44:48.000000000 -0400
-+++ sdcv-0.4.2/src/libwrapper.cpp	2009-07-25 17:39:11.000000000 -0400
-@@ -24,6 +24,7 @@
- 
- #include <glib/gi18n.h>
- #include <map>
-+#include <cstring>
- 
- #include "utils.hpp"
- 
-diff -ur sdcv-0.4.2-orig/src/readline.cpp sdcv-0.4.2/src/readline.cpp
---- sdcv-0.4.2-orig/src/readline.cpp	2009-07-25 17:44:48.000000000 -0400
-+++ sdcv-0.4.2/src/readline.cpp	2009-07-25 17:39:11.000000000 -0400
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <cstdio>
-+#include <cstdlib>
- #ifdef WITH_READLINE
- #  include <readline/readline.h>
- #  include <readline/history.h>
-diff -ur sdcv-0.4.2-orig/src/utils.cpp sdcv-0.4.2/src/utils.cpp
---- sdcv-0.4.2-orig/src/utils.cpp	2009-07-25 17:44:48.000000000 -0400
-+++ sdcv-0.4.2/src/utils.cpp	2009-07-25 17:44:17.000000000 -0400
-@@ -22,6 +22,8 @@
- #  include "config.h"
- #endif
- 
-+#include <cstdio>
-+#include <cstdlib>
- #include <glib.h>
- #include <glib/gi18n.h>
- 
-Only in sdcv-0.4.2/src: utils.o

diff --git a/app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch b/app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch
deleted file mode 100644
index 5b61650..0000000
--- a/app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'src/sdcv.cpp'
---- src/sdcv.cpp	2008-11-18 12:43:28 +0000
-+++ src/sdcv.cpp	2008-11-18 12:43:41 +0000
-@@ -161,7 +161,11 @@
- 
- 	strlist_t dicts_dir_list;
- 
--	dicts_dir_list.push_back(std::string(g_get_home_dir())+G_DIR_SEPARATOR+
-+	const char *homedir = g_getenv ("HOME");
-+	if (!homedir)
-+		homedir = g_get_home_dir ();
-+
-+	dicts_dir_list.push_back(std::string(homedir)+G_DIR_SEPARATOR+
- 				 ".stardict"+G_DIR_SEPARATOR+"dic");
- 	dicts_dir_list.push_back(data_dir);   
- 
-

diff --git a/app-text/sdcv/sdcv-0.4.2.ebuild b/app-text/sdcv/sdcv-0.4.2.ebuild
deleted file mode 100644
index 45b4806..0000000
--- a/app-text/sdcv/sdcv-0.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="Console version of Stardict program"
-HOMEPAGE="http://sdcv.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls test"
-
-RDEPEND="sys-libs/zlib
-	sys-libs/readline
-	>=dev-libs/glib-2.6.1"
-DEPEND="${RDEPEND}
-	test? ( app-dicts/stardict-quick-ru-en )
-	nls? ( >=sys-devel/gettext-0.14.1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-missing-headers.patch"
-	epatch "${FILESDIR}/${P}-crash.patch"
-	epatch "${FILESDIR}/${P}-g-handling.patch"
-	epatch "${FILESDIR}/${P}-respect-HOME.patch"
-	epatch "${FILESDIR}"/${P}-dash.patch
-}
-
-src_compile() {
-	econf $(use_enable nls)
-	emake || die "emake failed"
-}
-
-src_test() {
-	export HOME=${T}
-	mkdir -p "${HOME}/.stardict/dic"
-	emake check || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-}