bump to 2.20.1

Package-Manager: portage-2.1.3.13

8 files changed, 166 insertions, 35 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index fed301e804c5..cf030afd57b7 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.77 2007/10/03 00:57:02 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.78 2007/10/17 22:11:45 eva Exp $
+
+  17 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org> seahorse-0.8.1.ebuild,
+  seahorse-0.8.2-r1.ebuild, seahorse-1.0.ebuild, seahorse-1.0.1.ebuild:
+  fix some QA warnings
+
+*seahorse-2.20.1 (17 Oct 2007)
+
+  17 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +seahorse-2.20.1.ebuild:
+  bump to 2.20.1
 
 *seahorse-2.20.0 (03 Oct 2007)
 
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 3eb7970a1ec2..eb8063640187 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX seahorse-0.8.2-gpg2.0.patch 3653 RMD160 c09d7155c681b21e753214fc2c9fc9fab3865ff1 SHA1 4433dc5ca9f368d0086adc16e72fef9437058453 SHA256 d8feb6b08b5b2782e52353852456199b343f6302bfc033490a03d9468e414aad
 MD5 bc220351dc574bc032a290ba97c13752 files/seahorse-0.8.2-gpg2.0.patch 3653
 RMD160 c09d7155c681b21e753214fc2c9fc9fab3865ff1 files/seahorse-0.8.2-gpg2.0.patch 3653
@@ -15,30 +18,35 @@ DIST seahorse-0.8.2.tar.bz2 990284 RMD160 722f060a2d54ff028c7dfcf3e935153ca49968
 DIST seahorse-1.0.1.tar.bz2 1857602 RMD160 c11d2b0ae114cb41d52a3dc068f8a4fafc322603 SHA1 03e5232d47e0d9d16fe7a713b00533859583a8d8 SHA256 6afdbba1629b054c93c9a657f797c574a2bf96c0a6ab15a5d99c5b8ee5601a1b
 DIST seahorse-1.0.tar.bz2 1871080 RMD160 21b2500be16c0143cee0d5e696c3241597bce2f2 SHA1 c2902e2d57bda5a612b252ccbe5a7891708d5e2e SHA256 76bcfeed3843b2357f5ecc1694a471fc45a810aa17fd0baed60f1d32142d0746
 DIST seahorse-2.20.0.tar.bz2 2120569 RMD160 ab3916dcd2bfa07300282696d090fad1a811e7bc SHA1 902efb15908b8d1955d54c08cebc941db3e0b310 SHA256 9536c1f40e8a17abb38cecda9a3916c881615ae5b87dc4aa4a469a3ce347a6a0
-EBUILD seahorse-0.8.1.ebuild 1390 RMD160 b0f0bec9453ddda617f59b5649b25ec3d9182352 SHA1 91c09d035ff02a6e451dd3a249c470a41a33e903 SHA256 509922fee40f9a3b1c686764edf9223cb1401321a7c0e2b1bee6b420dddc1043
-MD5 48abe675030524c09e1dc301f3b21497 seahorse-0.8.1.ebuild 1390
-RMD160 b0f0bec9453ddda617f59b5649b25ec3d9182352 seahorse-0.8.1.ebuild 1390
-SHA256 509922fee40f9a3b1c686764edf9223cb1401321a7c0e2b1bee6b420dddc1043 seahorse-0.8.1.ebuild 1390
-EBUILD seahorse-0.8.2-r1.ebuild 1685 RMD160 bcc60b581965f507c1009ac80449d9fc622e1e7b SHA1 e4d9f8d3cc1c6e54eb469d757f35041ce5d5cf43 SHA256 a6abcbcac60879c0a80b7d7d283fcb9f1ac919f4f87514252f474b14b1271418
-MD5 0e215c74351787cca75572838a78cec2 seahorse-0.8.2-r1.ebuild 1685
-RMD160 bcc60b581965f507c1009ac80449d9fc622e1e7b seahorse-0.8.2-r1.ebuild 1685
-SHA256 a6abcbcac60879c0a80b7d7d283fcb9f1ac919f4f87514252f474b14b1271418 seahorse-0.8.2-r1.ebuild 1685
-EBUILD seahorse-1.0.1.ebuild 2654 RMD160 c7e7ec852d10137e9347479eb8cdd91ccf3c5bf4 SHA1 40c7bb596a99ba38bcfba0ee7ecad51516a4ac00 SHA256 79f111f41e3e59a534444439c3db1236d92aadd925abc0b3ee98bbcddabffe4f
-MD5 5218b09b1d18e0e3502eff2ddef6b9c0 seahorse-1.0.1.ebuild 2654
-RMD160 c7e7ec852d10137e9347479eb8cdd91ccf3c5bf4 seahorse-1.0.1.ebuild 2654
-SHA256 79f111f41e3e59a534444439c3db1236d92aadd925abc0b3ee98bbcddabffe4f seahorse-1.0.1.ebuild 2654
-EBUILD seahorse-1.0.ebuild 2552 RMD160 c4f71462f2bbe9fa8f6db907e42d2a3347881c72 SHA1 646c25d4ba2d2eeca7d59697f633a960060dc640 SHA256 0d794c3b3ee35ad6c41751c8421a0dff79333712ef662055d4a14fe67b3d01b4
-MD5 47dfa4980ab2fb00f5e608f1d484b8c3 seahorse-1.0.ebuild 2552
-RMD160 c4f71462f2bbe9fa8f6db907e42d2a3347881c72 seahorse-1.0.ebuild 2552
-SHA256 0d794c3b3ee35ad6c41751c8421a0dff79333712ef662055d4a14fe67b3d01b4 seahorse-1.0.ebuild 2552
+DIST seahorse-2.20.1.tar.bz2 2287702 RMD160 a2508bac5ad9df42edb52ab619abf6320e76d76a SHA1 7e8f5684598cfb7232a804e3462ee5ea583e6254 SHA256 718ff187c1951d0a2baa6dd1b9e97ddf9c5d845ebd356b502437a83582843dbf
+EBUILD seahorse-0.8.1.ebuild 1324 RMD160 29dd2c0000b78afe2b159877e336c91ab9b63891 SHA1 687504a5b065798d2e7d9c54200eca0c5e3a6254 SHA256 5c7154e1af1b8c97c53bd6dc3e33dd3c8ff229aa59928ed0a08fa9163c16c525
+MD5 d37936e86bde6ebfcec418dfb8840c2b seahorse-0.8.1.ebuild 1324
+RMD160 29dd2c0000b78afe2b159877e336c91ab9b63891 seahorse-0.8.1.ebuild 1324
+SHA256 5c7154e1af1b8c97c53bd6dc3e33dd3c8ff229aa59928ed0a08fa9163c16c525 seahorse-0.8.1.ebuild 1324
+EBUILD seahorse-0.8.2-r1.ebuild 1620 RMD160 43d1424e52dd6070a8d555e6f575eb996d0af724 SHA1 2dcd792c2f167aede52ff45cdf09834670592158 SHA256 f7fd38981b756b8cdd6cfd96583aa6a5c609105e667dabe2742affe6fb9e8452
+MD5 af7f49404e6ade87febb65809bc66840 seahorse-0.8.2-r1.ebuild 1620
+RMD160 43d1424e52dd6070a8d555e6f575eb996d0af724 seahorse-0.8.2-r1.ebuild 1620
+SHA256 f7fd38981b756b8cdd6cfd96583aa6a5c609105e667dabe2742affe6fb9e8452 seahorse-0.8.2-r1.ebuild 1620
+EBUILD seahorse-1.0.1.ebuild 2654 RMD160 98fc12d6e142cfc818c2ecb666c8eb289bf9a2c9 SHA1 107ef1feaec5255cb18754b60212600884e4b1f9 SHA256 62f6c0b6b7592715e36417222f8dfdc819efdb529cb537c6ce15e6938c2dfe70
+MD5 e31e1da71f148f0414b9102746950be6 seahorse-1.0.1.ebuild 2654
+RMD160 98fc12d6e142cfc818c2ecb666c8eb289bf9a2c9 seahorse-1.0.1.ebuild 2654
+SHA256 62f6c0b6b7592715e36417222f8dfdc819efdb529cb537c6ce15e6938c2dfe70 seahorse-1.0.1.ebuild 2654
+EBUILD seahorse-1.0.ebuild 2548 RMD160 ce80a277f295e2ff8aa008cca96aba742ae28ab2 SHA1 72fdabde6150e0abfee2f2012f2a361798863fa2 SHA256 cb302163ea0a88e373289480d8ef73a0cb8382c6cebe206fbb4fa52ecc19167c
+MD5 33ce48259d7a21fa2e765d32bbefa901 seahorse-1.0.ebuild 2548
+RMD160 ce80a277f295e2ff8aa008cca96aba742ae28ab2 seahorse-1.0.ebuild 2548
+SHA256 cb302163ea0a88e373289480d8ef73a0cb8382c6cebe206fbb4fa52ecc19167c seahorse-1.0.ebuild 2548
 EBUILD seahorse-2.20.0.ebuild 2748 RMD160 92b3d0cbd3ce436f09146cc1d62933aa6fb32a10 SHA1 00a2304019ca0d720b42f901f485a18ef202e68a SHA256 49b564c8ae9169749ff958c646a1fdb857a62bc7c734dbaed72008750b76cd9a
 MD5 101fe183903ec35e168202b4a7e5cec3 seahorse-2.20.0.ebuild 2748
 RMD160 92b3d0cbd3ce436f09146cc1d62933aa6fb32a10 seahorse-2.20.0.ebuild 2748
 SHA256 49b564c8ae9169749ff958c646a1fdb857a62bc7c734dbaed72008750b76cd9a seahorse-2.20.0.ebuild 2748
-MISC ChangeLog 11253 RMD160 c0aef307753779f1226202509f755f0d15666d40 SHA1 4e4989eae74d230b708a07633fcd7ecb9519719c SHA256 8f468a19d04fb65f422887c68b3652069e146c9fadbc8e5346e276465ef84de6
-MD5 92694df076bd377a8850df5ce739c298 ChangeLog 11253
-RMD160 c0aef307753779f1226202509f755f0d15666d40 ChangeLog 11253
-SHA256 8f468a19d04fb65f422887c68b3652069e146c9fadbc8e5346e276465ef84de6 ChangeLog 11253
+EBUILD seahorse-2.20.1.ebuild 2743 RMD160 4755265d0cafd4f09bdcc25bff0543164b5a6e33 SHA1 5ceaf7ea7b593944690581283341f29b5edab1c0 SHA256 dc18bbafcfba86256dac7661a95d9a1fe178864f7beb66baafbf8998024810ae
+MD5 97aba421b94ca117eff6e04d48a4c544 seahorse-2.20.1.ebuild 2743
+RMD160 4755265d0cafd4f09bdcc25bff0543164b5a6e33 seahorse-2.20.1.ebuild 2743
+SHA256 dc18bbafcfba86256dac7661a95d9a1fe178864f7beb66baafbf8998024810ae seahorse-2.20.1.ebuild 2743
+MISC ChangeLog 11552 RMD160 f401be35861e4e87f0d28a008193174118882b63 SHA1 cebf86e4fbd12b7639a7722cf8eded71e410f84b SHA256 4e187daafada99f5bf9505b43dec130ab460564e69a4ca1b09a71fa87346e116
+MD5 e8591bb5d8dfcc7563e68e787224fd84 ChangeLog 11552
+RMD160 f401be35861e4e87f0d28a008193174118882b63 ChangeLog 11552
+SHA256 4e187daafada99f5bf9505b43dec130ab460564e69a4ca1b09a71fa87346e116 ChangeLog 11552
 MISC metadata.xml 780 RMD160 c5e95c5325bed2618a42b61f14599216b4bc8bd9 SHA1 043ab719fdc21177c44b7a19054af736d8e7e10e SHA256 231c85c6d4fbf88839ec78311946ccdb3b66b34c1d274b11220672049f1bb099
 MD5 0d1bd8402596d34029899d32c0e6cd46 metadata.xml 780
 RMD160 c5e95c5325bed2618a42b61f14599216b4bc8bd9 metadata.xml 780
@@ -58,3 +66,13 @@ SHA256 98ebfe275aeb22588ccf094f22c6e6aaf163769eef40a2dde5eabf784f1a7838 files/di
 MD5 19630e06557b8ba6b26f9da96bdf7a6f files/digest-seahorse-2.20.0 253
 RMD160 33aada1facb7929e08b2298ecb64f392aeca00c8 files/digest-seahorse-2.20.0 253
 SHA256 7338af0b8253a03c0cd97741fa905a172d28e9df838ab944c9ebf3fc59089a25 files/digest-seahorse-2.20.0 253
+MD5 8b2cddb0392758d21e078f5c86cac70e files/digest-seahorse-2.20.1 253
+RMD160 0b51c18be3dd465fca640f7a6577d842f397fa2f files/digest-seahorse-2.20.1 253
+SHA256 14ea31d6d9d698d143b5b39c3a41d954787d70feb5a4b1706954a0449a767692 files/digest-seahorse-2.20.1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHFoi01fmVwcYIWAYRAqQ6AJwMMTsu4jAxUAcIEBetB6Cq1fhoYgCfdlrb
+0dvzc9A5TA7RiGNfmZar1qE=
+=zcTe
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/files/digest-seahorse-2.20.1 b/app-crypt/seahorse/files/digest-seahorse-2.20.1
new file mode 100644
index 000000000000..6ccfb24b3cad
--- /dev/null
+++ b/app-crypt/seahorse/files/digest-seahorse-2.20.1
@@ -0,0 +1,3 @@
+MD5 e4266963ee9d2ffc6185938a7eaf474d seahorse-2.20.1.tar.bz2 2287702
+RMD160 a2508bac5ad9df42edb52ab619abf6320e76d76a seahorse-2.20.1.tar.bz2 2287702
+SHA256 718ff187c1951d0a2baa6dd1b9e97ddf9c5d845ebd356b502437a83582843dbf seahorse-2.20.1.tar.bz2 2287702
diff --git a/app-crypt/seahorse/seahorse-0.8.1.ebuild b/app-crypt/seahorse/seahorse-0.8.1.ebuild
index b06be2c49435..65628a4a18b8 100644
--- a/app-crypt/seahorse/seahorse-0.8.1.ebuild
+++ b/app-crypt/seahorse/seahorse-0.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.8.1.ebuild,v 1.8 2007/07/13 21:47:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.8.1.ebuild,v 1.9 2007/10/17 22:11:45 eva Exp $
 
 inherit gnome2 eutils autotools flag-o-matic
 
@@ -47,6 +47,5 @@ src_install() {
 	gnome2_src_install
 
 	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf ${D}/usr/share/mime/application ${D}/usr/share/mime/magic ${D}/usr/share/mime/globs \
-		${D}/usr/share/mime/XMLnamespaces
+	rm -rf "${D}"/usr/share/mime/{application,magic,globs,XMLnamespaces}
 }
diff --git a/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild b/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild
index 13ce43f192cf..cf6532a3d1d7 100644
--- a/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild,v 1.1 2007/01/03 13:42:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild,v 1.2 2007/10/17 22:11:45 eva Exp $
 
 inherit gnome2 eutils autotools flag-o-matic
 
@@ -47,7 +47,7 @@ pkg_setup() {
 
 src_unpack() {
 	gnome2_src_unpack
-	epatch ${FILESDIR}/${PN}-0.8.2-gpg2.0.patch
+	epatch "${FILESDIR}"/${PN}-0.8.2-gpg2.0.patch
 }
 
 src_compile() {
@@ -59,6 +59,5 @@ src_install() {
 	gnome2_src_install
 
 	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf ${D}/usr/share/mime/application ${D}/usr/share/mime/magic \
-		   ${D}/usr/share/mime/globs ${D}/usr/share/mime/XMLnamespaces
+	rm -rf "${D}"/usr/share/mime/{application,magic,globs,XMLnamespaces}
 }
diff --git a/app-crypt/seahorse/seahorse-1.0.1.ebuild b/app-crypt/seahorse/seahorse-1.0.1.ebuild
index a02d38db07e1..e5e643a0600c 100644
--- a/app-crypt/seahorse/seahorse-1.0.1.ebuild
+++ b/app-crypt/seahorse/seahorse-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-1.0.1.ebuild,v 1.7 2007/08/02 04:58:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-1.0.1.ebuild,v 1.8 2007/10/17 22:11:45 eva Exp $
 
 inherit gnome2 eutils flag-o-matic
 
@@ -78,8 +78,8 @@ pkg_setup() {
 
 src_unpack() {
 	gnome2_src_unpack
-	epatch ${FILESDIR}/${PN}-0.9.10-update-mime.patch
-	epatch ${FILESDIR}/${PN}-1.0.1-setuid-agent.patch
+	epatch "${FILESDIR}"/${PN}-0.9.10-update-mime.patch
+	epatch "${FILESDIR}"/${PN}-1.0.1-setuid-agent.patch
 }
 
 src_compile() {
@@ -91,5 +91,5 @@ src_install() {
 	gnome2_src_install
 
 	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf ${D}/usr/share/mime/{application,magic,globs,XMLnamespaces}
+	rm -rf "${D}"/usr/share/mime/{application,magic,globs,XMLnamespaces}
 }
diff --git a/app-crypt/seahorse/seahorse-1.0.ebuild b/app-crypt/seahorse/seahorse-1.0.ebuild
index c2e4b8e35cc5..04a043600481 100644
--- a/app-crypt/seahorse/seahorse-1.0.ebuild
+++ b/app-crypt/seahorse/seahorse-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-1.0.ebuild,v 1.7 2007/08/02 04:58:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-1.0.ebuild,v 1.8 2007/10/17 22:11:45 eva Exp $
 
 inherit gnome2 eutils flag-o-matic
 
@@ -77,7 +77,7 @@ pkg_setup() {
 
 src_unpack() {
 	gnome2_src_unpack
-	epatch ${FILESDIR}/${PN}-0.9.10-update-mime.patch
+	epatch "${FILESDIR}"/${PN}-0.9.10-update-mime.patch
 }
 
 src_compile() {
diff --git a/app-crypt/seahorse/seahorse-2.20.1.ebuild b/app-crypt/seahorse/seahorse-2.20.1.ebuild
new file mode 100644
index 000000000000..fa4c68992023
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-2.20.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.20.1.ebuild,v 1.1 2007/10/17 22:11:45 eva Exp $
+
+inherit gnome2 eutils flag-o-matic
+
+GNOME_TARBALL_SUFFIX="gz"
+
+DESCRIPTION="A GNOME application for managing encryption keys"
+HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="applet avahi dbus debug gedit keyring ldap libnotify nautilus"
+
+RDEPEND=">=gnome-base/libgnome-2.14
+		 >=gnome-base/libgnomeui-2.10
+		 >=gnome-base/gnome-vfs-2.0
+		 >=gnome-base/libglade-2.0
+		 >=gnome-base/gconf-2.0
+		 >=dev-libs/glib-2.10
+		 >=x11-libs/gtk+-2.10
+		 >=net-libs/libsoup-2.2
+		 >=dev-libs/libxml2-2.6.0
+		 || (
+				=app-crypt/gnupg-1.2*
+				=app-crypt/gnupg-1.4*
+				=app-crypt/gnupg-2.0*
+		 	)
+		 >=app-crypt/gpgme-1.0.0
+		   net-misc/openssh
+		   x11-misc/shared-mime-info
+		 applet? ( >=gnome-base/gnome-panel-2.10 )
+		 avahi? ( >=net-dns/avahi-0.6 )
+		 dbus?	( ||	(
+							>=dev-libs/dbus-glib-0.72
+							( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+		 				)
+				)
+		 gedit? ( >=app-editors/gedit-2.16 )
+		 keyring? ( gnome-base/gnome-keyring )
+		 ldap? ( net-nds/openldap )
+		 libnotify? ( >=x11-libs/libnotify-0.3.2 )
+		 nautilus? ( >=gnome-base/nautilus-2.10 )"
+DEPEND="${RDEPEND}
+		sys-devel/gettext
+		>=app-text/gnome-doc-utils-0.3.2
+		>=app-text/scrollkeeper-0.3
+		>=dev-util/pkgconfig-0.20
+		>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
+
+pkg_setup() {
+	if ! use dbus ; then
+		if use applet ; then
+			elog
+			elog "The panel applet requires that you build seahorse with DBUS support."
+			elog
+		fi
+
+		if use gedit ; then
+			elog
+			elog "The GEdit plugin requires that you build seahorse with DBUS support."
+			elog
+		fi
+
+		eerror "Please add dbus to your USE flags and re-emerge seahorse"
+		eerror "plugins require dbus support"
+	fi
+
+	G2CONF="${G2CONF} --enable-ssh --disable-update-mime-database \
+			--enable-hkp --with-keyserver --enable-agent \
+			--localstatedir=${D}/var/lib/scrollkeeper/ --disable-epiphany \
+			$(use_enable applet) \
+			$(use_enable avahi sharing) \
+			$(use_enable dbus) \
+			$(use_enable debug) \
+			$(use_enable gedit) \
+			$(use_enable keyring gnome-keyring) \
+			$(use_enable ldap) \
+			$(use_enable libnotify) \
+			$(use_enable nautilus)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}/${PN}-0.9.10-update-mime.patch"
+}
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+	gnome2_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	# remove conflicts with x11-misc/shared-mime-info
+	rm -rf "${D}/usr/share/mime/"{application,magic,globs,XMLnamespaces}
+}