* [gentoo-commits] repo/gentoo:master commit in: app-crypt/debian-archive-keyring/, app-crypt/debian-archive-keyring/files/
@ 2017-04-08 16:04 Sebastian Pipping
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping @ 2017-04-08 16:04 UTC (permalink / raw
To: gentoo-commits
commit: ff059ce089f72d0cc53f0335a54babc9004a3e47
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 8 16:03:46 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Apr 8 16:04:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff059ce0
app-crypt/debian-archive-keyring: Fix compilation (bug #614932)
Thanks to Toralf Foerster
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../debian-archive-keyring-2014.3.ebuild | 8 +++--
.../debian-archive-keyring-2014.3-order.patch | 36 ++++++++++++++++++++++
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
index b0acabf6bc8..fde180a215f 100644
--- a/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.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=5
+EAPI=6
DESCRIPTION="GnuPG archive keys of the Debian archive"
HOMEPAGE="http://packages.debian.org/sid/debian-archive-keyring"
@@ -15,3 +15,7 @@ IUSE=""
DEPEND="app-crypt/jetring"
MAKEOPTS+=' -j1'
+
+PATCHES=(
+ "${FILESDIR}"/${P}-order.patch
+)
diff --git a/app-crypt/debian-archive-keyring/files/debian-archive-keyring-2014.3-order.patch b/app-crypt/debian-archive-keyring/files/debian-archive-keyring-2014.3-order.patch
new file mode 100644
index 00000000000..59b2412bf99
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/files/debian-archive-keyring-2014.3-order.patch
@@ -0,0 +1,36 @@
+From fdf28f2cb17ae0bf8fac569335dabdbc9e83a452 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 8 Apr 2017 14:55:06 +0200
+Subject: [PATCH] Ensure verification starts after build
+
+---
+ Makefile | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0952a5d..b722226 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,12 @@ TMPRING := trusted.gpg/build-area
+
+ GPG_OPTIONS := --no-options --no-default-keyring --no-auto-check-trustdb --trustdb-name ./trustdb.gpg
+
+-build: verify-indices keyrings/debian-archive-keyring.gpg keyrings/debian-archive-removed-keys.gpg verify-results $(TRUSTED-LIST)
++all:
++ $(MAKE) build verify
++
++build: keyrings/debian-archive-keyring.gpg keyrings/debian-archive-removed-keys.gpg $(TRUSTED-LIST)
++
++verify: verify-indices verify-results
+
+ verify-indices: keyrings/team-members.gpg
+ gpg ${GPG_OPTIONS} \
+@@ -61,4 +66,4 @@ install: build
+ install -d $(DESTDIR)/etc/apt/trusted.gpg.d/
+ cp $(shell find trusted.gpg/ -name '*.gpg' -type f) $(DESTDIR)/etc/apt/trusted.gpg.d/
+
+-.PHONY: verify-indices verify-results clean build install
++.PHONY: all verify verify-indices verify-results clean build install
+--
+2.12.2
+
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/debian-archive-keyring/, app-crypt/debian-archive-keyring/files/
@ 2017-05-21 14:22 Sebastian Pipping
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping @ 2017-05-21 14:22 UTC (permalink / raw
To: gentoo-commits
commit: e27e066be274861b127297b6a749975e3d355d80
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 14:19:26 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun May 21 14:21:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e27e066b
app-crypt/debian-archive-keyring: Save compiling non-code (bug #614932)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-crypt/debian-archive-keyring/Manifest | 2 +-
.../debian-archive-keyring-2014.3.ebuild | 14 ++++-----
.../debian-archive-keyring-2014.3-order.patch | 36 ----------------------
3 files changed, 8 insertions(+), 44 deletions(-)
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
index 1677b987809..405e61b414c 100644
--- a/app-crypt/debian-archive-keyring/Manifest
+++ b/app-crypt/debian-archive-keyring/Manifest
@@ -1 +1 @@
-DIST debian-archive-keyring_2014.3.tar.xz 61380 SHA256 46be978ec2f72b0277d9e71bda30ea1b2b9aa00b1952cb35e8b22a2c016f5e22 SHA512 6ae189976dca807705c76fab16d8219f042dc3c8a12e6f12872cc6faa8941831392d0b97a34367c24855f98621ba2eb56e71440291bc12a5cecc05ea2b5622ab WHIRLPOOL 94344189e21e42333e5f131aada6bda02d7f9bf72c809df00ef6e570810524bd9b9f4e79b55237b224155fb651205a60848ce037e4dae138b6449e97c1ace9ea
+DIST debian-archive-keyring_2014.3_all.deb 40060 SHA256 017a2fba215cd64612891f5aa02546be5c0e30923a66672f889867cc6dd8d3a0 SHA512 7a24596f250eafb6e62d19523cd13c3b1809bea3f694bd92f3d427f67cd840e0292200e6b033b5c5c5cf41ab40233ae17d133a846be483afa1da3b67cac72931 WHIRLPOOL a533e18402fd85e08f4ce1e96b6c9c79e8ec844afdc588557cfd730cd5cc8b36e711e4629e9d74c7f36b129d02c711b24f8626a00489775c8ef7bd29c567ce0e
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
index fde180a215f..7f78c2c6b24 100644
--- a/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
@@ -3,19 +3,19 @@
EAPI=6
+inherit unpacker
+
DESCRIPTION="GnuPG archive keys of the Debian archive"
HOMEPAGE="http://packages.debian.org/sid/debian-archive-keyring"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="app-crypt/jetring"
-
-MAKEOPTS+=' -j1'
+S="${WORKDIR}"
-PATCHES=(
- "${FILESDIR}"/${P}-order.patch
-)
+src_install() {
+ doins -r .
+}
diff --git a/app-crypt/debian-archive-keyring/files/debian-archive-keyring-2014.3-order.patch b/app-crypt/debian-archive-keyring/files/debian-archive-keyring-2014.3-order.patch
deleted file mode 100644
index 59b2412bf99..00000000000
--- a/app-crypt/debian-archive-keyring/files/debian-archive-keyring-2014.3-order.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fdf28f2cb17ae0bf8fac569335dabdbc9e83a452 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 8 Apr 2017 14:55:06 +0200
-Subject: [PATCH] Ensure verification starts after build
-
----
- Makefile | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 0952a5d..b722226 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,12 @@ TMPRING := trusted.gpg/build-area
-
- GPG_OPTIONS := --no-options --no-default-keyring --no-auto-check-trustdb --trustdb-name ./trustdb.gpg
-
--build: verify-indices keyrings/debian-archive-keyring.gpg keyrings/debian-archive-removed-keys.gpg verify-results $(TRUSTED-LIST)
-+all:
-+ $(MAKE) build verify
-+
-+build: keyrings/debian-archive-keyring.gpg keyrings/debian-archive-removed-keys.gpg $(TRUSTED-LIST)
-+
-+verify: verify-indices verify-results
-
- verify-indices: keyrings/team-members.gpg
- gpg ${GPG_OPTIONS} \
-@@ -61,4 +66,4 @@ install: build
- install -d $(DESTDIR)/etc/apt/trusted.gpg.d/
- cp $(shell find trusted.gpg/ -name '*.gpg' -type f) $(DESTDIR)/etc/apt/trusted.gpg.d/
-
--.PHONY: verify-indices verify-results clean build install
-+.PHONY: all verify verify-indices verify-results clean build install
---
-2.12.2
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-21 14:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-08 16:04 [gentoo-commits] repo/gentoo:master commit in: app-crypt/debian-archive-keyring/, app-crypt/debian-archive-keyring/files/ Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2017-05-21 14:22 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox