gentoo auto-resync : 30:04:2023 - 05:16:35

3 files changed, 72 insertions, 1 deletions

diff --git a/app-misc/esekeyd/Manifest b/app-misc/esekeyd/Manifest
index e2793492b627..f2104b6a66e1 100644
--- a/app-misc/esekeyd/Manifest
+++ b/app-misc/esekeyd/Manifest
@@ -1,5 +1,6 @@
+AUX 1.2.7-fix-revision.patch 1848 BLAKE2B 8e2be02275696b7fb361d8e4b7f30d553d9627a872f4885d9c581625c375f0e631f0ee3fe0a5dfffbf6829e82afe67f08b5a7fa98ce431576cc48ed0625c228b SHA512 13564ffedb5cce8637483b42907cbe2b177fb72814389fdbcce9c9155c0f965aed6f5c5c0422706748e247f168721de7c2b0a8cfe6804dc9ac5f5a9ec298ed0b
 DIST esekeyd-1.2.7.gh.tar.gz 10623 BLAKE2B 599813e046ddbd69c218dc823c760c3598d3f1ef0411e953f7c64adc00846b63912fc143baeca8acd9d4631e99e7fac79246309af06dce6bd852c3124604908e SHA512 cc6d227ee5138b4bbc6affcf5214c7233d9245532d69233afe2322121b04428e0708c923bea8db358fe5e0bd4a6b9d6f67f3dbd8fafd0accdff8508600929b0d
 DIST esekeyd-1.2.7.tar.gz 104502 BLAKE2B d8060837e533c5c3fda11dc3a2d67f3010b820035d1f1a794c296a132f3dde3c17fe132257b996532ae6caa57fe2150c370aa71d03c2e48b9a88568498144769 SHA512 dc15623e0ffdd4cc7f3834b2becabf54ce61ea5190fd44734b2aa426db3d936cb5e3caada82357d6ed41db6eba41e9f792e453e2bb93c0fe62d87ac29651c89a
-EBUILD esekeyd-1.2.7-r1.ebuild 540 BLAKE2B 23e7f3f6d369ffbd5b207a36b9ed2c5cc149cf06f98715d051fb7429930e8c26e9bb03b18cbe9c4eada742d6491102da381043a3d00b8a7c75dc07afeb3ad535 SHA512 c3ab7f603ae70fc3f371b64392cc4c3cfb378390570ae8fd950ab9c5cfcfd26880d5c90c4e19dc0eef2a98f68bbc73033da8437b0e71346e8db7ce5bfa6e6710
+EBUILD esekeyd-1.2.7-r2.ebuild 593 BLAKE2B 56b578bbc1ff34ffa9a4f685898037a96f2a18d62b714cc91e64d8402bd00183086c1831396657d0bfa646dd319bfaa83cbafee50494779cbe6a270ef6961e9c SHA512 b01dd6037eb981c2daff33619698d1828d7903d968182c5f8d4de1b2781c8a52599ecff76100b6e4cf00d47d45bd240904fd5834042ff945c39a979ac5e1645a
 EBUILD esekeyd-1.2.7.ebuild 411 BLAKE2B ac15d61336c88eb707c33c9306eee0f322aca8e3831e64605b0b9d78a68416268ff49c67c76b699108eca1c6eb718fcf8b696676abd15966844d8810734d82e6 SHA512 6cf397221052837399690bb08356671f700dd046c5b4bc23ffa96d61f59c9557474776e30f046d826e0c2dd528bf9805435f56e8d72c2a1b106f8e8873b49af8
 MISC metadata.xml 250 BLAKE2B e9fe0d85755c59844a0c5b9c778fc133497a5668092981bdc769d0a633339cadfabb83c7e1e9caa0318126738e06a26d62f58b3c791654a2d74b350c77b3dcd1 SHA512 1cc83afebea3005de88f5a36fdbf7aab599ed985b0e1b267dbb61d48433f945519a7d48565d855248ff5bc273a6f60d30067c6dbce1082f7d9fa15ece40e17a9
diff --git a/app-misc/esekeyd/esekeyd-1.2.7-r1.ebuild b/app-misc/esekeyd/esekeyd-1.2.7-r2.ebuild
index 0405ac1bc018..76b688ceeeaf 100644
--- a/app-misc/esekeyd/esekeyd-1.2.7-r1.ebuild
+++ b/app-misc/esekeyd/esekeyd-1.2.7-r2.ebuild
@@ -14,6 +14,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
+PATCHES=(
+	"${FILESDIR}/1.2.7-fix-revision.patch"
+)
+
 DOCS=( AUTHORS ChangeLog examples/example.conf NEWS README TODO )
 
 src_prepare() {
diff --git a/app-misc/esekeyd/files/1.2.7-fix-revision.patch b/app-misc/esekeyd/files/1.2.7-fix-revision.patch
new file mode 100644
index 000000000000..af59712c3ce7
--- /dev/null
+++ b/app-misc/esekeyd/files/1.2.7-fix-revision.patch
@@ -0,0 +1,66 @@
+From 28bd6caa3401b2e79fa4c922ecc2d5d1ada8460f Mon Sep 17 00:00:00 2001
+From: Krzysztof Burghardt <krzysztof@burghardt.pl>
+Date: Tue, 11 Aug 2015 07:03:34 +0200
+Subject: [PATCH] Include git describe output in each binary.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,5 +9,12 @@ version.h:
+ endif
+ 	echo \#define PACKAGE_VERSION_SVN_REV \"SVN-r`svnversion`\" > version.h
+ 
++if DOT_GIT
++version.h: .git/HEAD .git/index
++else
++version.h:
++endif
++	echo \#define PACKAGE_VERSION_SVN_REV \"GIT-`git describe --dirty --always --tags`\" > version.h
++
+ all: config.h version.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,6 +4,7 @@ AC_CONFIG_SRCDIR(src/esekeyd.c)
+ AM_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE
+ AM_CONDITIONAL([DOT_SVN], [test -f .svn/entries])
++AM_CONDITIONAL([DOT_GIT], [test -f .git/index])
+ 
+ if test "$CFLAGS"; then
+  CFLAGS_CUSTOM=yes
+From dbac719dfd8d0d4aa4fe4699c73772553d7566f7 Mon Sep 17 00:00:00 2001
+From: Krzysztof Burghardt <krzysztof@burghardt.pl>
+Date: Thu, 13 Aug 2015 22:30:17 +0200
+Subject: [PATCH] Do not override all:, use BUILT_SOURCES for version.h
+ generation.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,20 +1,20 @@
+ SUBDIRS = src doc examples
+ 
++BUILT_SOURCES = version.h
+ EXTRA_DIST = version.h
+ 
+ if DOT_SVN
+ version.h: .svn/entries
+-else
+-version.h:
+-endif
+ 	echo \#define PACKAGE_VERSION_SVN_REV \"SVN-r`svnversion`\" > version.h
+-
++else
+ if DOT_GIT
+ version.h: .git/HEAD .git/index
++	echo \#define PACKAGE_VERSION_SVN_REV \"GIT-`git describe --dirty --always --tags`\" > version.h
+ else
+ version.h:
++	echo \#define PACKAGE_VERSION_SVN_REV \"unknown\" > version.h
++endif
+ endif
+-	echo \#define PACKAGE_VERSION_SVN_REV \"GIT-`git describe --dirty --always --tags`\" > version.h
+ 
+-all: config.h version.h
+-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
++clean-local:
++	rm -f version.h