reinit the tree, so we can have metadata

5 files changed, 147 insertions, 0 deletions

diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
new file mode 100644
index 000000000000..f2aa581a3c00
--- /dev/null
+++ b/dev-libs/volume_key/Manifest
@@ -0,0 +1,5 @@
+AUX volume_key-0.3.9-config.h.diff 819 SHA256 de5f66ee91a652874dea2e09742c26ea16c41b053eef167f375876deb2b18757 SHA512 ce8fd4fd60baacda3bfd88de86f5251bd9394f4b13dbb0ece494a07c3510429c458cef051cf56d9ef04b97e7120898ab62585fd1966a93724ea0476a9d465c04 WHIRLPOOL 5a6afb754979d2132c7fd02cc7f3aa4e8fb2882456ada6b19364da72df1f620055825b78ff19f6d61c7f2df455516b94cf0e2bedd69daeb680deb16fdb67ecdf
+AUX volume_key-0.3.9-find_python.patch 1845 SHA256 18da65782c7294ea8ddc1bbd06ecf22c6c33e2a474c4614e696265cc5d65e1e5 SHA512 5b2de4c5c18bb17fbf2a7e5de8adc36d919c5e98aafc33bbd3464ab60ce520ee0b4da0447f7e55ae262c9f6243936badd20f8ce5f9f3367188d80ba28932d0d7 WHIRLPOOL dc10ade55e83b7a7183301d105f4771067051dad25d4a840d957d751d1237275ade43481173f41d3afe9707a42b3dfdfe6760682164bffdbf57d8d999b3dbc3d
+DIST volume_key-0.3.9.tar.xz 445092 SHA256 450a54fe9bf56acec6850c1e71371d3e4913c9ca1ef0cdc3a517b4b6910412a6 SHA512 bc0e690997b9fa1c9fff361d04e7eddcac4cac09779d7a1f9e161be117f5c589a7e444ac16dab25fb3e3ce201591f7dc937595ddf2745d7daa625d4ab0a255e0 WHIRLPOOL 928279511717a8fcd94a13b52c1450770f8f22aed4334a4dc87440cf3ffa706e99de6dac21ac8a7e6db990570525e4cf5f163b92351239d95dcf0b3f2b7cd8c7
+EBUILD volume_key-0.3.9.ebuild 900 SHA256 6c57a91e8ec3c45456f51c2c65aabe738e824b03355bdddddf390b838754c997 SHA512 55d1ccc55fa48d1eb9811ad098ea34ead889b5927533aa87cfa83ec704ea5b9c9be83b97a9e60ff135d0a9be39f82b49f6a7fa9b9a03d13cf860c43bd7ca435d WHIRLPOOL e5975a2fa3d12c7efcdca31c2ee3f0f63be40d803c13a0f6dc259b008527d6dd04e8e6bda5baf298b9cdc966b6d46c865421f5d29d20e6487783061fe7bb1ff7
+MISC metadata.xml 257 SHA256 60e4ef3049f5fa18420a7f022f935739458c852364eae6f39636410f0902c089 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea WHIRLPOOL 81d95f2549c08fe57538c904c4d9d89f5c12c342e3ad031414bd4abb4e58fc8a0c37edbd62941fbdbf2b5b69ab2bec2e6798704b53b35f78806d625ae7377697
diff --git a/dev-libs/volume_key/files/volume_key-0.3.9-config.h.diff b/dev-libs/volume_key/files/volume_key-0.3.9-config.h.diff
new file mode 100644
index 000000000000..138e92ee8f62
--- /dev/null
+++ b/dev-libs/volume_key/files/volume_key-0.3.9-config.h.diff
@@ -0,0 +1,27 @@
+From 8f8698aba19b501f01285e9eec5c18231fc6bcea Mon Sep 17 00:00:00 2001
+From: Vratislav Podzimek <vpodzime@redhat.com>
+Date: Tue, 6 Jan 2015 13:06:52 +0100
+Subject: Do not include config.h in libvolume_key.h
+
+The library's header file distributed in the devel package cannot include
+the config.h file that is only available during build otherwise it's not
+possible to use the library outside of the volume_key build process.
+
+Signed-off-by: Vratislav Podzimek <vpodzime@redhat.com>
+
+diff --git a/lib/libvolume_key.h b/lib/libvolume_key.h
+index 657b626..513f923 100644
+--- a/lib/libvolume_key.h
++++ b/lib/libvolume_key.h
+@@ -18,8 +18,6 @@ Author: Miloslav Trmač <mitr@redhat.com> */
+ #ifndef LIBVOLUME_KEY_H__
+ #define LIBVOLUME_KEY_H__
+ 
+-#include <config.h>
+-
+ #include <cert.h>
+ #include <glib.h>
+ 
+-- 
+cgit v0.10.2
+
diff --git a/dev-libs/volume_key/files/volume_key-0.3.9-find_python.patch b/dev-libs/volume_key/files/volume_key-0.3.9-find_python.patch
new file mode 100644
index 000000000000..00ca74fdc785
--- /dev/null
+++ b/dev-libs/volume_key/files/volume_key-0.3.9-find_python.patch
@@ -0,0 +1,56 @@
+From 67fbdb6133b6d37548250514eeaf8a4e239e4768 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 22 May 2017 14:29:44 +0200
+Subject: [PATCH] Use pkgconfig to find python
+
+otherwise linkage and include of python fails if python is not in
+default (python$(PYTHON_VERSION)) location.
+---
+ Makefile.am  | 4 ++--
+ configure.ac | 8 +++++++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4569bbf..445a64c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
+ AM_CPPFLAGS = $(blkid_CFLAGS) $(glib_CFLAGS) $(GPGME_CFLAGS) \
+ 	$(libcryptsetup_CFLAGS) $(nss_CFLAGS)
+ LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"'
+-PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION)
++PYTHON_CPPFLAGS = $(PYTHON_CFLAGS)
+ 
+ ## Targets
+ SUBDIRS = po
+@@ -65,7 +65,7 @@ lib_libvolume_key_la_LIBADD = $(blkid_LIBS) $(glib_LIBS) $(GPGME_LIBS) \
+ python__volume_key_la_SOURCES = python/volume_key_wrap.c
+ python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS)
+ python__volume_key_la_LDFLAGS = -module -avoid-version $(glib_LIBS)
+-python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION) \
++python__volume_key_la_LIBADD = lib/libvolume_key.la $(PYTHON_LIBS) \
+ 	$(glib_LIBS) $(nss_LIBS)
+ 
+ src_volume_key_SOURCES = src/volume_key.c
+diff --git a/configure.ac b/configure.ac
+index 5dbb326..71e407e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,7 +28,13 @@ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AM_PROG_AR
+ LT_INIT([disable-static])
+-AM_PATH_PYTHON
++
++PKG_CHECK_MODULES([PYTHON], [python], [has_python=yes], [])
++AS_IF([test "x$has_python" = "xyes"], [
++    AM_PATH_PYTHON
++    AC_SUBST([PYTHON_CFLAGS])
++    AC_SUBST([PYTHON_LIBS])
++])
+ 
+ dnl Not gpg2, it cannot receive passphrases from gpgme
+ AC_PATH_PROG([GPG], [gpg])
+-- 
+2.13.0
+
diff --git a/dev-libs/volume_key/metadata.xml b/dev-libs/volume_key/metadata.xml
new file mode 100644
index 000000000000..c7be278b6458
--- /dev/null
+++ b/dev-libs/volume_key/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/volume_key/volume_key-0.3.9.ebuild b/dev-libs/volume_key/volume_key-0.3.9.ebuild
new file mode 100644
index 000000000000..7c6d96f24964
--- /dev/null
+++ b/dev-libs/volume_key/volume_key-0.3.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
+HOMEPAGE="https://pagure.io/volume_key"
+SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/nss
+	sys-apps/util-linux
+	sys-devel/gettext
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-crypt/gpgme
+	sys-fs/cryptsetup
+	test? ( dev-libs/nss[utils] )
+	"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+
+RESTRICT="test" # possible gpgme issue
+
+PATCHES=(
+	"${FILESDIR}"/${P}-config.h.diff
+	"${FILESDIR}"/${PN}-0.3.9-find_python.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}