[gentoo-commits] repo/gentoo:master commit in: dev-util/bdelta/
commit: ce5bd2917711d272e5c3e7124923f6bc28d36556
Author: Sam James gentoo org>
AuthorDate: Sat Aug 27 16:56:00 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 27 16:56:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5bd291
dev-util/bdelta: fix EbuildReservedName (drop unused semi-live template bits)
Not sure what LIVE_EBUILD was supposed to be but there's no live
ebuild now and it's not how we normally do live ebuild
templates nowadays anyway.
Maybe it was something like PROPERTIES="live" before we had it,
or maybe just nothing. Dunno!
Signed-off-by: Sam James gentoo.org>
dev-util/bdelta/bdelta-0.3.1-r1.ebuild | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
b/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
index bf1c9ae4ddbf..88d9366e4cae 100644
--- a/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
+++ b/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
@@ -1,21 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs vcs-snapshot
-if [[ -z ${LIVE_EBUILD} ]]; then
- KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
- SRC_URI="https://github.com/jjwhitney/BDelta/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-fi
-
DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
HOMEPAGE="https://github.com/jjwhitney/BDelta;
+SRC_URI="https://github.com/jjwhitney/BDelta/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-SLOT="0"
LICENSE="MPL-2.0"
-IUSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
PATCHES=(
"${FILESDIR}"/${P}-soname.patch
[gentoo-commits] repo/gentoo:master commit in: dev-util/bdelta/
commit: dcea266653b1f06b4a7ebb78918766b947a5b354 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Jul 2 07:12:35 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Jul 2 07:17:15 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcea2666 dev-util/bdelta: drop myself from maintainers Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich gentoo.org> dev-util/bdelta/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/dev-util/bdelta/metadata.xml b/dev-util/bdelta/metadata.xml index 85db5a5c526..bf6352f9b27 100644 --- a/dev-util/bdelta/metadata.xml +++ b/dev-util/bdelta/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -sly...@gentoo.org -Sergei Trofimovich - tools-port...@gentoo.org Gentoo Portage tools team
[gentoo-commits] repo/gentoo:master commit in: dev-util/bdelta/
commit: bcc4f9d1b22e546e0389137961ba3a06884840e2
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Nov 9 16:29:31 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Nov 9 16:29:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcc4f9d1
dev-util/bdelta: bump up to EAPI=7
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-util/bdelta/bdelta-0.3.1-r1.ebuild | 16
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
b/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
index 9bbc378a96a..bf1c9ae4ddb 100644
--- a/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
+++ b/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
@@ -1,21 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-if [[ ${PV} = ** ]]; then
- EGIT_REPO_URI="https://github.com/jjwhitney/BDelta.git;
- UNPACKER_ECLASS="git-2"
- LIVE_EBUILD=yes
-else
- UNPACKER_ECLASS="vcs-snapshot"
-fi
-
-inherit toolchain-funcs ${UNPACKER_ECLASS}
+inherit toolchain-funcs vcs-snapshot
if [[ -z ${LIVE_EBUILD} ]]; then
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
- SRC_URI="https://github.com/jjwhitney/BDelta/tarball/v${PV} ->
${P}.tar.gz"
+ SRC_URI="https://github.com/jjwhitney/BDelta/archive/v${PV}.tar.gz ->
${P}.tar.gz"
fi
DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
[gentoo-commits] repo/gentoo:master commit in: dev-util/bdelta/
commit: 457db620353b6554143dbe680cfec5a692721cb7 Author: Michał Górny gentoo org> AuthorDate: Sun Feb 11 10:46:43 2018 + Commit: Michał Górny gentoo org> CommitDate: Sun Feb 11 10:51:38 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=457db620 dev-util/bdelta: Remove useless maintainer Remove useless/redundant maintainer . It does not benefit bug wrangling, and only wastes developer's time on reading it. Few tips: - assignee/CC is implied by ordering, there is no reason to repeat it, - we know that maintainer is maintainer (la la la la la), - most of adjectives for maintainer are of no value and/or are obvious. dev-util/bdelta/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-util/bdelta/metadata.xml b/dev-util/bdelta/metadata.xml index fcec0af2919..85db5a5c526 100644 --- a/dev-util/bdelta/metadata.xml +++ b/dev-util/bdelta/metadata.xml @@ -4,7 +4,6 @@ sly...@gentoo.org Sergei Trofimovich -Primary Maintainer tools-port...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-util/bdelta/
commit: bba64a968aeec4c90cad07c65cf3f811097bcbf7
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Jul 4 21:33:20 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Jul 4 21:56:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba64a96
dev-util/bdelta: update HOMEPAGE, bump up to EAPI=6
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../{bdelta-0.3.1.ebuild => bdelta-0.3.1-r1.ebuild} | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-util/bdelta/bdelta-0.3.1.ebuild
b/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
similarity index 76%
rename from dev-util/bdelta/bdelta-0.3.1.ebuild
rename to dev-util/bdelta/bdelta-0.3.1-r1.ebuild
index edb6de3eca3..c199f1524f7 100644
--- a/dev-util/bdelta/bdelta-0.3.1.ebuild
+++ b/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=6
if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="git://github.com/jjwhitney/BDelta.git"
@@ -11,7 +11,7 @@ else
UNPACKER_ECLASS="vcs-snapshot"
fi
-inherit eutils multilib toolchain-funcs ${UNPACKER_ECLASS}
+inherit toolchain-funcs ${UNPACKER_ECLASS}
if [[ -z ${LIVE_EBUILD} ]]; then
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
@@ -19,16 +19,16 @@ if [[ -z ${LIVE_EBUILD} ]]; then
fi
DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
-HOMEPAGE="http://bdelta.org;
+HOMEPAGE="https://github.com/jjwhitney/BDelta;
SLOT="0"
LICENSE="MPL-2.0"
IUSE=""
-src_prepare() {
- epatch "${FILESDIR}"/${P}-soname.patch
- epatch "${FILESDIR}"/${P}-gcc-6.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-soname.patch
+ "${FILESDIR}"/${P}-gcc-6.patch
+)
src_compile() {
emake -C src \
[gentoo-commits] repo/gentoo:master commit in: dev-util/bdelta/, dev-util/bdelta/files/
commit: eb4328c13b45b7b8e945bbf599443b8254bb2772
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Sep 18 18:59:16 2016 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Sep 18 18:59:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb4328c1
dev-util/bdelta: tweak for gcc-6, bug #594246
c++11 intruduced next() helper
http://en.cppreference.com/w/cpp/iterator/next
which does exactly the same.
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/594246
Package-Manager: portage-2.3.0
dev-util/bdelta/bdelta-0.3.1.ebuild| 3 ++-
dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch | 18 ++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/dev-util/bdelta/bdelta-0.3.1.ebuild
b/dev-util/bdelta/bdelta-0.3.1.ebuild
index adb6de1..9e75a60 100644
--- a/dev-util/bdelta/bdelta-0.3.1.ebuild
+++ b/dev-util/bdelta/bdelta-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -28,6 +28,7 @@ IUSE=""
src_prepare() {
epatch "${FILESDIR}"/${P}-soname.patch
+ epatch "${FILESDIR}"/${P}-gcc-6.patch
}
src_compile() {
diff --git a/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch
b/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch
new file mode 100644
index ..9c998de
--- /dev/null
+++ b/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch
@@ -0,0 +1,18 @@
+diff --git a/src/libbdelta.cpp b/src/libbdelta.cpp
+index b11bb2b..d769b0d 100644
+--- a/src/libbdelta.cpp
b/src/libbdelta.cpp
+@@ -117,7 +117,3 @@ unsigned match_backward(BDelta_Instance *b, unsigned p1,
unsigned p2, unsigned b
+ // Iterator helper function
+-template
+-inline T prior(T i) {return --i;}
+-template
+-inline T next(T i) {return ++i;}
+-
++template inline T bdelta_next(T i) {return ++i;}
+
+@@ -423,3 +419,3 @@ void bdelta_pass(BDelta_Instance *b, unsigned blocksize,
unsigned minMatchSize,
+ if (! maxHoleSize || (u1.num <= maxHoleSize &&
u2.num <= maxHoleSize))
+- if (! (flags & BDELTA_SIDES_ORDERED) ||
(next(u1.ml) == u1.mr && next(u2.ml) == u2.mr))
++ if (! (flags & BDELTA_SIDES_ORDERED) ||
(bdelta_next(u1.ml) == u1.mr && bdelta_next(u2.ml) == u2.mr))
+ bdelta_pass_2(b, blocksize,
minMatchSize, , 1, , 1);
[gentoo-commits] repo/gentoo:master commit in: dev-util/bdelta/
commit: f3476b3f26fb9209c9ca6d3ee4fb3cd2e1839c2c
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon May 2 13:58:36 2016 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon May 2 13:58:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3476b3f
dev-util/bdelta: drop live ebuild
Package-Manager: portage-2.2.28
dev-util/bdelta/bdelta-.ebuild | 41 --
1 file changed, 41 deletions(-)
diff --git a/dev-util/bdelta/bdelta-.ebuild
b/dev-util/bdelta/bdelta-.ebuild
deleted file mode 100644
index a7cdf5a..000
--- a/dev-util/bdelta/bdelta-.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-if [[ ${PV} = ** ]]; then
- EGIT_REPO_URI="git://github.com/jjwhitney/BDelta.git"
- UNPACKER_ECLASS="git-2"
- LIVE_EBUILD=yes
-else
- UNPACKER_ECLASS="vcs-snapshot"
-fi
-
-inherit multilib toolchain-funcs ${UNPACKER_ECLASS}
-
-if [[ -z ${LIVE_EBUILD} ]]; then
- KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
- SRC_URI="https://github.com/jjwhitney/BDelta/tarball/v${PV} ->
${P}.tar.gz"
-fi
-
-DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
-HOMEPAGE="http://bdelta.org;
-
-SLOT="0"
-LICENSE="MPL-2.0"
-IUSE=""
-
-src_compile() {
- emake -C src \
- CXX="$(tc-getCXX)" \
- CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
- emake -C src install \
- DESTDIR="${D}" \
- PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- dodoc README
-}
