[gentoo-commits] repo/gentoo:master commit in: app-portage/deltup/, app-portage/deltup/files/

[gentoo-commits] repo/gentoo:master commit in: app-portage/deltup/, app-portage/deltup/files/

[Sergei Trofimovich]

commit:     9a8ce341be72dd7df418fc472968f1e44851e427
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 20 07:39:01 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 07:40:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8ce341

app-portage/deltup: respect user's LDFLAGS, use CX, not CC

While at it dropped use of unknown command:
    epatch_user: command not found

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 ...{deltup-0.4.6.ebuild => deltup-0.4.6-r1.ebuild} | 10 +++++-----
 app-portage/deltup/files/deltup-0.4.6-cxx.patch    | 23 ++++++++++++++++++++++
 .../deltup/files/deltup-0.4.6-ldflags.patch        |  9 +++++++++
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/app-portage/deltup/deltup-0.4.6.ebuild b/app-portage/deltup/deltup-0.4.6-r1.ebuild
similarity index 87%
rename from app-portage/deltup/deltup-0.4.6.ebuild
rename to app-portage/deltup/deltup-0.4.6-r1.ebuild
index cdc06476fff..9c4ebf21a65 100644
--- a/app-portage/deltup/deltup-0.4.6.ebuild
+++ b/app-portage/deltup/deltup-0.4.6-r1.ebuild
@@ -26,13 +26,13 @@ DEPEND="
 RDEPEND="${DEPEND}
 	|| ( dev-util/bdelta =dev-util/xdelta-1* )"
 
-src_prepare () {
-	default
-	epatch_user
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.6-ldflags.patch
+	"${FILESDIR}"/${PN}-0.4.6-cxx.patch
+)
 
 src_compile () {
-	emake CC=$(tc-getCXX)
+	emake CXX=$(tc-getCXX)
 }
 
 src_install () {

diff --git a/app-portage/deltup/files/deltup-0.4.6-cxx.patch b/app-portage/deltup/files/deltup-0.4.6-cxx.patch
new file mode 100644
index 00000000000..6a07dc1ee0a
--- /dev/null
+++ b/app-portage/deltup/files/deltup-0.4.6-cxx.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile b/Makefile
+index 6a3aa95..a591a6f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,3 +7,3 @@ CC = g++
+ objfiles=bpatch.o archfunc.o file.o system.o tmpstore.o deltup.o 
+-libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl
++libs=-lz -lbz2 -lcrypto #-lssl
+ 
+@@ -12,3 +12,3 @@ libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl
+ %.o : %.cpp
+-	${CC} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic
++	${CXX} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic
+ 
+@@ -17,6 +17,6 @@ all: deltup
+ depend:
+-	gcc -MM *.cpp > .depend
++	${CXX} -MM *.cpp > .depend
+ 	
+ deltup: $(objfiles)
+-	${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs)
++	${CXX} $(objfiles) ${LDFLAGS} -o deltup $(libs)
+ 

diff --git a/app-portage/deltup/files/deltup-0.4.6-ldflags.patch b/app-portage/deltup/files/deltup-0.4.6-ldflags.patch
new file mode 100644
index 00000000000..0d06255abcd
--- /dev/null
+++ b/app-portage/deltup/files/deltup-0.4.6-ldflags.patch
@@ -0,0 +1,9 @@
+diff --git a/Makefile b/Makefile
+index 6a3aa95..6e7c5cf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,3 +20,3 @@ depend:
+ deltup: $(objfiles)
+-	${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs)
++	${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs)
+ 

[gentoo-commits] repo/gentoo:master commit in: app-portage/deltup/, app-portage/deltup/files/

[Sergei Trofimovich]

commit:     c7791ebd3b2e66b110e2943524e32cb54c7de5cf
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 20 07:39:58 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 07:40:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7791ebd

app-portage/deltup: drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-portage/deltup/Manifest                        |  1 -
 app-portage/deltup/deltup-0.4.5-r1.ebuild          | 38 ----------------------
 app-portage/deltup/files/deltup-0.4.4-gcc47.patch  | 11 -------
 .../deltup/files/deltup-0.4.4-zlib-1.2.5.2.patch   | 21 ------------
 .../deltup/files/deltup-0.4.5-underlink.patch      | 11 -------
 5 files changed, 82 deletions(-)

diff --git a/app-portage/deltup/Manifest b/app-portage/deltup/Manifest
index 36a69e512b8..80f6f50610f 100644
--- a/app-portage/deltup/Manifest
+++ b/app-portage/deltup/Manifest
@@ -1,2 +1 @@
-DIST deltup-0.4.5.tar.gz 14728 SHA256 9c8597780513e5231eb07b05cb1a1ee07b0fec71a4be2dd4a5cb2dd1011fc795 SHA512 fae6814f74fd62eee45701eed4df45ed5f6b6da50cff53d7a04ff3f6e11553ad526c3b3262048e210b1d932b6d30cba69ac1962b867b01aed90de58b45bf6c37 WHIRLPOOL a91994aa049ec25fc1b5d3a816595354114ef37e9655b5d91aea973fdfa187b77aa33aa620de3c38c5888bd2d9c89f376a3de8dd43104515961b3ffc128ab77e
 DIST deltup-0.4.6.tar.gz 14869 SHA256 f86b304dcdadc864cd347d382dc2c9c249e399f22408d6d7d68490374386c365 SHA512 196be319f31860d89654c23241edde503d4194064617970d87cb0d0a66544959bc666dd34a3bf1a42e69ddb5927420728a1e208b7bb848e935e99f3a090ffa7a WHIRLPOOL 4186c446ea3bcbd28577119e56ca2fe5ce8b479f80ebc48ca34727481385d0e854714a6aad34a466b933279e3f3709cc1b78607cc216c81acee800e480e37b26

diff --git a/app-portage/deltup/deltup-0.4.5-r1.ebuild b/app-portage/deltup/deltup-0.4.5-r1.ebuild
deleted file mode 100644
index e0c4bac6228..00000000000
--- a/app-portage/deltup/deltup-0.4.5-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Delta-Update - patch system for updating source-archives"
-HOMEPAGE="http://deltup.sourceforge.net"
-SRC_URI="http://deltup.org/e107_files/downloads//${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl:0
-	sys-libs/zlib
-	app-arch/bzip2"
-RDEPEND="${DEPEND}
-	|| ( dev-util/bdelta =dev-util/xdelta-1* )"
-
-src_prepare () {
-	epatch "${FILESDIR}"/${PN}-0.4.4-gcc47.patch
-	epatch "${FILESDIR}"/${PN}-0.4.4-zlib-1.2.5.2.patch
-	epatch "${FILESDIR}"/${PN}-0.4.5-underlink.patch
-	epatch_user
-}
-
-src_compile () {
-	emake CXX=$(tc-getCXX)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc README ChangeLog
-	doman deltup.1
-}

diff --git a/app-portage/deltup/files/deltup-0.4.4-gcc47.patch b/app-portage/deltup/files/deltup-0.4.4-gcc47.patch
deleted file mode 100644
index 507f8278bfc..00000000000
--- a/app-portage/deltup/files/deltup-0.4.4-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u deltup-0.4.4.old/tmpstore.cpp deltup-0.4.4/tmpstore.cpp
---- deltup-0.4.4.old/tmpstore.cpp	2007-03-24 23:45:29.000000000 +0100
-+++ deltup-0.4.4/tmpstore.cpp	2012-08-11 14:45:31.380739060 +0200
-@@ -19,6 +19,7 @@
- using namespace std;
- #include "file.h"
- #include "system.h"
-+#include "unistd.h"
- #include <openssl/md5.h>
- 
- string tmpdir;

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
deleted file mode 100644
index a650bf1a017..00000000000
--- a/app-portage/deltup/files/deltup-0.4.4-zlib-1.2.5.2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix building with zlib >= 1.2.5.2, see http://bugs.gentoo.org/406203
-
---- file.cpp
-+++ file.cpp
-@@ -20,12 +20,12 @@
- #include "file.h"
- 
- GZ_IFStream::GZ_IFStream(string fname) {file = gzopen(fname.c_str(), "rb");}
--GZ_IFStream::~GZ_IFStream() {if (!bad()) gzclose(file);}
--unsigned GZ_IFStream::read(void *data, unsigned num) {return gzread(file, data, num);}
-+GZ_IFStream::~GZ_IFStream() {if (!bad()) gzclose((gzFile)file);}
-+unsigned GZ_IFStream::read(void *data, unsigned num) {return gzread((gzFile)file, data, num);}
- 
- GZ_OFStream::GZ_OFStream(string fname) {file = gzopen(fname.c_str(), "wb");}
--GZ_OFStream::~GZ_OFStream() {gzclose(file);}
--unsigned GZ_OFStream::write(const void *data, unsigned num) {return gzwrite(file, (voidp)data, num);}
-+GZ_OFStream::~GZ_OFStream() {gzclose((gzFile)file);}
-+unsigned GZ_OFStream::write(const void *data, unsigned num) {return gzwrite((gzFile)file, (voidp)data, num);}
- 
- BZ_IFStream::BZ_IFStream(string fname) {file = BZ2_bzopen(fname.c_str(), "rb");}
- BZ_IFStream::~BZ_IFStream() {if (!bad()) BZ2_bzclose(file);}

diff --git a/app-portage/deltup/files/deltup-0.4.5-underlink.patch b/app-portage/deltup/files/deltup-0.4.5-underlink.patch
deleted file mode 100644
index d0637b0caad..00000000000
--- a/app-portage/deltup/files/deltup-0.4.5-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- deltup-0.4.5/Makefile.orig	2009-06-26 00:38:01.000000000 +0400
-+++ deltup-0.4.5/Makefile	2013-08-21 07:24:33.606691559 +0400
-@@ -5,7 +5,7 @@
- CC = g++
- 
- objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o 
--libs=-lstdc++ -lz -lbz2 -lssl
-+libs=-lstdc++ -lz -lbz2 -lcrypto
- 
- #edelta: edelta.cpp deltup
- #	gcc edelta.cpp ${CXXFLAGS} -o edelta