[gentoo-commits] proj/gnome:master commit in: status/portage-configs/, dev-libs/p11-kit/, app-crypt/p11-kit/, ...

[Alexandre Restovtsev]

commit:     0df6afdacec3bf007487d9d58d85789626c0747b
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Oct  1 10:16:39 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct  1 10:16:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0df6afda

dev-libs/p11-kit → app-crypt/p11-kit

Turns out that p11-kit was recently added to portage, but in the
app-crypt category.

---
 .../p11-kit/p11-kit-9999.ebuild                    |   12 ++---
 dev-libs/p11-kit/p11-kit-0.7.ebuild                |   52 --------------------
 .../gnome-keyring/gnome-keyring-3.2.0.ebuild       |    2 +-
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |    2 +-
 profiles/updates/3Q-2011                           |    1 +
 status/portage-configs/package.keywords.gnome3     |    2 +-
 6 files changed, 9 insertions(+), 62 deletions(-)

diff --git a/dev-libs/p11-kit/p11-kit-9999.ebuild b/app-crypt/p11-kit/p11-kit-9999.ebuild
similarity index 78%
rename from dev-libs/p11-kit/p11-kit-9999.ebuild
rename to app-crypt/p11-kit/p11-kit-9999.ebuild
index 2a2b5d6..5b22363 100644
--- a/dev-libs/p11-kit/p11-kit-9999.ebuild
+++ b/app-crypt/p11-kit/p11-kit-9999.ebuild
@@ -5,11 +5,10 @@
 EAPI="4"
 
 if [[ ${PV} = 9999 ]]; then
-	GCONF_DEBUG="no"
 	inherit gnome2-live # to avoid duplicating hacks from gnome2-live_src_prepare
 fi
 
-DESCRIPTION="Library and proxy module for loading and sharing PKCS#11 modules"
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11."
 HOMEPAGE="http://p11-glue.freedesktop.org/p11-kit.html"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/p11-glue/p11-kit"
@@ -17,14 +16,14 @@ else
 	SRC_URI="http://p11-glue.freedesktop.org/releases/${P}.tar.gz"
 fi
 
-LICENSE="BSD"
+LICENSE="MIT"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~hppa ~x86"
 fi
-IUSE="doc"
+IUSE="debug doc"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -40,13 +39,12 @@ DOCS=(AUTHORS ChangeLog NEWS README)
 
 src_configure() {
 	econf \
-		--disable-coverage \
 		--disable-maintainer-mode \
 		--with-system-config="${EPREFIX}/etc/pkcs11" \
+		$(use_enable debug) \
 		$(use_enable doc gtk-doc)
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
 }

diff --git a/dev-libs/p11-kit/p11-kit-0.7.ebuild b/dev-libs/p11-kit/p11-kit-0.7.ebuild
deleted file mode 100644
index 2a2b5d6..0000000
--- a/dev-libs/p11-kit/p11-kit-0.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-if [[ ${PV} = 9999 ]]; then
-	GCONF_DEBUG="no"
-	inherit gnome2-live # to avoid duplicating hacks from gnome2-live_src_prepare
-fi
-
-DESCRIPTION="Library and proxy module for loading and sharing PKCS#11 modules"
-HOMEPAGE="http://p11-glue.freedesktop.org/p11-kit.html"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/p11-glue/p11-kit"
-else
-	SRC_URI="http://p11-glue.freedesktop.org/releases/${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		>=dev-util/gtk-doc-1.15
-	)
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-src_configure() {
-	econf \
-		--disable-coverage \
-		--disable-maintainer-mode \
-		--with-system-config="${EPREFIX}/etc/pkcs11" \
-		$(use_enable doc gtk-doc)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-}

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild
index b911436..ca7f9ef 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild
@@ -26,10 +26,10 @@ fi
 # USE=valgrind is probably not a good idea for the tree
 RDEPEND=">=dev-libs/glib-2.25:2
 	>=x11-libs/gtk+-2.90.0:3
+	>=app-crypt/p11-kit-0.6
 	app-misc/ca-certificates
 	>=dev-libs/libgcrypt-1.2.2
 	>=dev-libs/libtasn1-1
-	>=dev-libs/p11-kit-0.6
 	>=sys-apps/dbus-1.0
 	caps? ( sys-libs/libcap-ng )
 	pam? ( virtual/pam )

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index b911436..ca7f9ef 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -26,10 +26,10 @@ fi
 # USE=valgrind is probably not a good idea for the tree
 RDEPEND=">=dev-libs/glib-2.25:2
 	>=x11-libs/gtk+-2.90.0:3
+	>=app-crypt/p11-kit-0.6
 	app-misc/ca-certificates
 	>=dev-libs/libgcrypt-1.2.2
 	>=dev-libs/libtasn1-1
-	>=dev-libs/p11-kit-0.6
 	>=sys-apps/dbus-1.0
 	caps? ( sys-libs/libcap-ng )
 	pam? ( virtual/pam )

diff --git a/profiles/updates/3Q-2011 b/profiles/updates/3Q-2011
index 5fb0c91..01f3c5d 100644
--- a/profiles/updates/3Q-2011
+++ b/profiles/updates/3Q-2011
@@ -1,2 +1,3 @@
 slotmove =app-editors/ghex-3.0.0 3 2
 slotmove =app-editors/ghex-2.9* 3 2
+move dev-libs/p11-kit app-crypt/p11-kit

diff --git a/status/portage-configs/package.keywords.gnome3 b/status/portage-configs/package.keywords.gnome3
index 8e2f573..1130584 100644
--- a/status/portage-configs/package.keywords.gnome3
+++ b/status/portage-configs/package.keywords.gnome3
@@ -16,6 +16,7 @@ app-admin/packagekit-base
 app-admin/packagekit-gtk
 app-arch/file-roller
 app-cdr/brasero
+app-crypt/p11-kit
 app-crypt/seahorse
 app-crypt/seahorse-plugins
 app-misc/tracker
@@ -34,7 +35,6 @@ dev-libs/libgdata
 dev-libs/libgweather
 dev-libs/libpeas
 dev-libs/libunique:3
-dev-libs/p11-kit
 dev-perl/Text-CSV
 dev-python/pyatspi
 dev-python/pycairo