[gentoo-commits] proj/gnome:master commit in: app-crypt/seahorse-sharing/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     bb368fd044202ccd198f20d86e409d5894c15c35
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 13:53:27 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 13:59:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bb368fd0

app-crypt/seahorse-sharing: 3.6.0 → 3.6.1

---
 app-crypt/seahorse-sharing/metadata.xml            |    5 +++
 ...-3.6.0.ebuild => seahorse-sharing-3.6.1.ebuild} |   31 ++++++++++++++-----
 .../seahorse-sharing/seahorse-sharing-9999.ebuild  |   22 +++++++++----
 3 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/app-crypt/seahorse-sharing/metadata.xml b/app-crypt/seahorse-sharing/metadata.xml
new file mode 100644
index 0000000..6e0e2ec
--- /dev/null
+++ b/app-crypt/seahorse-sharing/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>

diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.6.0.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.6.1.ebuild
similarity index 56%
rename from app-crypt/seahorse-sharing/seahorse-sharing-3.6.0.ebuild
rename to app-crypt/seahorse-sharing/seahorse-sharing-3.6.1.ebuild
index b1742ca..f7e8202 100644
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.6.0.ebuild
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.6.1.ebuild
@@ -3,15 +3,23 @@
 # $Header: $
 
 EAPI="4"
+GCONF_DEUBG="yes" # disable asserts
 
 inherit gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
 HOMEPAGE="http://projects.gnome.org/seahorse/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2
@@ -36,14 +44,21 @@ src_prepare() {
 	# Do not pass --enable-tests to configure - package has no tests
 
 	gnome2_src_prepare
-	# Avoid eautoreconf
-	sed -e 's:$CFLAGS -g -O0:$CFLAGS:' -i configure || die "sed failed"
+
+	# Drop stupid CFLAGS
+	sed -e 's:$CFLAGS -g -O0:$CFLAGS:' \
+		-i configure || die "sed failed"
 }
 
 pkg_postinst() {
-	elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
-	elog "system, you can start the Avahi daemon by"
-	elog "# /etc/init.d/avahi-daemon start"
-	elog "To start Avahi automatically, add it to the default runlevel:"
-	elog "# rc-update add avahi-daemon default"
+	gnome2_pkg_postinst
+
+	if ! has_version net-dns/avahi && \
+		! rc-config list default | grep -q "avahi-daemon" ; then
+		elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
+		elog "system, you can start the Avahi daemon by"
+		elog "# /etc/init.d/avahi-daemon start"
+		elog "To start Avahi automatically, add it to the default runlevel:"
+		elog "# rc-update add avahi-daemon default"
+	fi
 }

diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-9999.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-9999.ebuild
index 2137a7a..f7e8202 100644
--- a/app-crypt/seahorse-sharing/seahorse-sharing-9999.ebuild
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-9999.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI="4"
+GCONF_DEUBG="yes" # disable asserts
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
@@ -43,14 +44,21 @@ src_prepare() {
 	# Do not pass --enable-tests to configure - package has no tests
 
 	gnome2_src_prepare
-	# Avoid eautoreconf
-	sed -e 's:$CFLAGS -g -O0:$CFLAGS:' -i configure || die "sed failed"
+
+	# Drop stupid CFLAGS
+	sed -e 's:$CFLAGS -g -O0:$CFLAGS:' \
+		-i configure || die "sed failed"
 }
 
 pkg_postinst() {
-	elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
-	elog "system, you can start the Avahi daemon by"
-	elog "# /etc/init.d/avahi-daemon start"
-	elog "To start Avahi automatically, add it to the default runlevel:"
-	elog "# rc-update add avahi-daemon default"
+	gnome2_pkg_postinst
+
+	if ! has_version net-dns/avahi && \
+		! rc-config list default | grep -q "avahi-daemon" ; then
+		elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
+		elog "system, you can start the Avahi daemon by"
+		elog "# /etc/init.d/avahi-daemon start"
+		elog "To start Avahi automatically, add it to the default runlevel:"
+		elog "# rc-update add avahi-daemon default"
+	fi
 }