Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/deltup/, app-portage/deltup/files/
Date: Thu, 20 Jul 2017 07:40:47
Message-Id: 1500536438.c7791ebd3b2e66b110e2943524e32cb54c7de5cf.slyfox@gentoo
1 commit: c7791ebd3b2e66b110e2943524e32cb54c7de5cf
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 20 07:39:58 2017 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 20 07:40:38 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7791ebd
7
8 app-portage/deltup: drop old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12 app-portage/deltup/Manifest | 1 -
13 app-portage/deltup/deltup-0.4.5-r1.ebuild | 38 ----------------------
14 app-portage/deltup/files/deltup-0.4.4-gcc47.patch | 11 -------
15 .../deltup/files/deltup-0.4.4-zlib-1.2.5.2.patch | 21 ------------
16 .../deltup/files/deltup-0.4.5-underlink.patch | 11 -------
17 5 files changed, 82 deletions(-)
18
19 diff --git a/app-portage/deltup/Manifest b/app-portage/deltup/Manifest
20 index 36a69e512b8..80f6f50610f 100644
21 --- a/app-portage/deltup/Manifest
22 +++ b/app-portage/deltup/Manifest
23 @@ -1,2 +1 @@
24 -DIST deltup-0.4.5.tar.gz 14728 SHA256 9c8597780513e5231eb07b05cb1a1ee07b0fec71a4be2dd4a5cb2dd1011fc795 SHA512 fae6814f74fd62eee45701eed4df45ed5f6b6da50cff53d7a04ff3f6e11553ad526c3b3262048e210b1d932b6d30cba69ac1962b867b01aed90de58b45bf6c37 WHIRLPOOL a91994aa049ec25fc1b5d3a816595354114ef37e9655b5d91aea973fdfa187b77aa33aa620de3c38c5888bd2d9c89f376a3de8dd43104515961b3ffc128ab77e
25 DIST deltup-0.4.6.tar.gz 14869 SHA256 f86b304dcdadc864cd347d382dc2c9c249e399f22408d6d7d68490374386c365 SHA512 196be319f31860d89654c23241edde503d4194064617970d87cb0d0a66544959bc666dd34a3bf1a42e69ddb5927420728a1e208b7bb848e935e99f3a090ffa7a WHIRLPOOL 4186c446ea3bcbd28577119e56ca2fe5ce8b479f80ebc48ca34727481385d0e854714a6aad34a466b933279e3f3709cc1b78607cc216c81acee800e480e37b26
26
27 diff --git a/app-portage/deltup/deltup-0.4.5-r1.ebuild b/app-portage/deltup/deltup-0.4.5-r1.ebuild
28 deleted file mode 100644
29 index e0c4bac6228..00000000000
30 --- a/app-portage/deltup/deltup-0.4.5-r1.ebuild
31 +++ /dev/null
32 @@ -1,38 +0,0 @@
33 -# Copyright 1999-2015 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=5
37 -
38 -inherit eutils toolchain-funcs flag-o-matic
39 -
40 -DESCRIPTION="Delta-Update - patch system for updating source-archives"
41 -HOMEPAGE="http://deltup.sourceforge.net"
42 -SRC_URI="http://deltup.org/e107_files/downloads//${P}.tar.gz"
43 -
44 -SLOT="0"
45 -LICENSE="GPL-2"
46 -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
47 -IUSE=""
48 -
49 -DEPEND="dev-libs/openssl:0
50 - sys-libs/zlib
51 - app-arch/bzip2"
52 -RDEPEND="${DEPEND}
53 - || ( dev-util/bdelta =dev-util/xdelta-1* )"
54 -
55 -src_prepare () {
56 - epatch "${FILESDIR}"/${PN}-0.4.4-gcc47.patch
57 - epatch "${FILESDIR}"/${PN}-0.4.4-zlib-1.2.5.2.patch
58 - epatch "${FILESDIR}"/${PN}-0.4.5-underlink.patch
59 - epatch_user
60 -}
61 -
62 -src_compile () {
63 - emake CXX=$(tc-getCXX)
64 -}
65 -
66 -src_install () {
67 - emake DESTDIR="${D}" install
68 - dodoc README ChangeLog
69 - doman deltup.1
70 -}
71
72 diff --git a/app-portage/deltup/files/deltup-0.4.4-gcc47.patch b/app-portage/deltup/files/deltup-0.4.4-gcc47.patch
73 deleted file mode 100644
74 index 507f8278bfc..00000000000
75 --- a/app-portage/deltup/files/deltup-0.4.4-gcc47.patch
76 +++ /dev/null
77 @@ -1,11 +0,0 @@
78 -diff -u deltup-0.4.4.old/tmpstore.cpp deltup-0.4.4/tmpstore.cpp
79 ---- deltup-0.4.4.old/tmpstore.cpp 2007-03-24 23:45:29.000000000 +0100
80 -+++ deltup-0.4.4/tmpstore.cpp 2012-08-11 14:45:31.380739060 +0200
81 -@@ -19,6 +19,7 @@
82 - using namespace std;
83 - #include "file.h"
84 - #include "system.h"
85 -+#include "unistd.h"
86 - #include <openssl/md5.h>
87 -
88 - string tmpdir;
89
90 diff --git a/app-portage/deltup/files/deltup-0.4.4-zlib-1.2.5.2.patch b/app-portage/deltup/files/deltup-0.4.4-zlib-1.2.5.2.patch
91 deleted file mode 100644
92 index a650bf1a017..00000000000
93 --- a/app-portage/deltup/files/deltup-0.4.4-zlib-1.2.5.2.patch
94 +++ /dev/null
95 @@ -1,21 +0,0 @@
96 -Fix building with zlib >= 1.2.5.2, see http://bugs.gentoo.org/406203
97 -
98 ---- file.cpp
99 -+++ file.cpp
100 -@@ -20,12 +20,12 @@
101 - #include "file.h"
102 -
103 - GZ_IFStream::GZ_IFStream(string fname) {file = gzopen(fname.c_str(), "rb");}
104 --GZ_IFStream::~GZ_IFStream() {if (!bad()) gzclose(file);}
105 --unsigned GZ_IFStream::read(void *data, unsigned num) {return gzread(file, data, num);}
106 -+GZ_IFStream::~GZ_IFStream() {if (!bad()) gzclose((gzFile)file);}
107 -+unsigned GZ_IFStream::read(void *data, unsigned num) {return gzread((gzFile)file, data, num);}
108 -
109 - GZ_OFStream::GZ_OFStream(string fname) {file = gzopen(fname.c_str(), "wb");}
110 --GZ_OFStream::~GZ_OFStream() {gzclose(file);}
111 --unsigned GZ_OFStream::write(const void *data, unsigned num) {return gzwrite(file, (voidp)data, num);}
112 -+GZ_OFStream::~GZ_OFStream() {gzclose((gzFile)file);}
113 -+unsigned GZ_OFStream::write(const void *data, unsigned num) {return gzwrite((gzFile)file, (voidp)data, num);}
114 -
115 - BZ_IFStream::BZ_IFStream(string fname) {file = BZ2_bzopen(fname.c_str(), "rb");}
116 - BZ_IFStream::~BZ_IFStream() {if (!bad()) BZ2_bzclose(file);}
117
118 diff --git a/app-portage/deltup/files/deltup-0.4.5-underlink.patch b/app-portage/deltup/files/deltup-0.4.5-underlink.patch
119 deleted file mode 100644
120 index d0637b0caad..00000000000
121 --- a/app-portage/deltup/files/deltup-0.4.5-underlink.patch
122 +++ /dev/null
123 @@ -1,11 +0,0 @@
124 ---- deltup-0.4.5/Makefile.orig 2009-06-26 00:38:01.000000000 +0400
125 -+++ deltup-0.4.5/Makefile 2013-08-21 07:24:33.606691559 +0400
126 -@@ -5,7 +5,7 @@
127 - CC = g++
128 -
129 - objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o
130 --libs=-lstdc++ -lz -lbz2 -lssl
131 -+libs=-lstdc++ -lz -lbz2 -lcrypto
132 -
133 - #edelta: edelta.cpp deltup
134 - # gcc edelta.cpp ${CXXFLAGS} -o edelta