Added a patch to allow seahorse-0.7.9 to compile with gedit-2.12. See bug #106144...

Package-Manager: portage-2.0.52-r1

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 292bae2051ea6dd36fcdee4aceeaf7c4f608a200..1c229440f0a3e6c17a2a389c30c59451f6ebb0ce 100644 (file)
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.41 2005/09/09 15:22:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.42 2005/09/18 04:17:16 obz Exp $
+
+  18 Sep 2005; Mike Gardiner <obz@gentoo.org>
+  +files/seahorse-0.7.9-gedit-2.12.patch, seahorse-0.7.9.ebuild:
+  Added a patch to allow seahorse-0.7.9 to compile with gedit-2.12. See bug
+  #106144 for the report. I've pushed the patch upstream, so this should be
+  fixed in the next release.
 
   09 Sep 2005; Aron Griffis <agriffis@gentoo.org> seahorse-0.6.3-r1.ebuild:
   Mark 0.6.3-r1 stable on alpha

diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 58369f9e7759c557e201c14da2ebf245afe685b8..ef6528a1e514f557893a3507ee723b6dd974195d 100644 (file)
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,12 +1,13 @@
+MD5 40db67d28e958e0a3f96bdbb9f038e8b ChangeLog 6072
 MD5 887271fc00711d11fb72536de7b1f7ec metadata.xml 1073
-MD5 3c9322a25e8faedc340cf229076c1984 seahorse-0.7.9.ebuild 1385
-MD5 2308b0bed8c9592a2adc9b18a33d3b66 ChangeLog 5784
-MD5 1152a9f44a915901cbaf02e9048e9797 seahorse-0.7.8.ebuild 1376
 MD5 d69dd9d58c3d148ed84b9658a11675ea seahorse-0.6.3-r1.ebuild 902
 MD5 87246c403988befd0ef3bd433ed5d44b seahorse-0.7.6.ebuild 1459
+MD5 1152a9f44a915901cbaf02e9048e9797 seahorse-0.7.8.ebuild 1376
+MD5 99dec7a64169d248bbc320f0bfe29608 seahorse-0.7.9.ebuild 1602
 MD5 052f1fee75fc120426817f6e7c0726f6 files/digest-seahorse-0.6.3-r1 66
 MD5 bea4522a079897b52604cc710d1a90c2 files/digest-seahorse-0.7.6 68
 MD5 0538ac585d34e29ee315dcfb6699e59d files/digest-seahorse-0.7.8 68
 MD5 c4e4d29d4acc7978fb91980fbe4fe8e7 files/digest-seahorse-0.7.9 68
-MD5 0a649fbc303b24897fc8f989c6b02c36 files/seahorse-0.7.6-gnome-2.10.patch 511
 MD5 1f02ad637af0dfe5012aa463ffb7fd1e files/seahorse-0.6.3-gpg1.4.patch 2572
+MD5 0a649fbc303b24897fc8f989c6b02c36 files/seahorse-0.7.6-gnome-2.10.patch 511
+MD5 e3a978f46c9d81a58770df145c61d794 files/seahorse-0.7.9-gedit-2.12.patch 743

diff --git a/app-crypt/seahorse/files/seahorse-0.7.9-gedit-2.12.patch b/app-crypt/seahorse/files/seahorse-0.7.9-gedit-2.12.patch
new file mode 100644 (file)
index 0000000..c187498
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-0.7.9-gedit-2.12.patch
@@ -0,0 +1,17 @@
+diff -ur seahorse-0.7.9/configure.in seahorse-0.7.9-patched/configure.in
+--- seahorse-0.7.9/configure.in        2005-07-03 05:34:41.000000000 +0800
++++ seahorse-0.7.9-patched/configure.in        2005-09-18 20:06:37.000000000 +0800
+@@ -251,9 +251,10 @@
+       echo "enabling gedit plugin..."
+       echo "checking for supported versions of gedit..."
+       
+-      PKG_CHECK_MODULES(GEDIT, gedit-2.10 >= 2.9.0, , 
+-      [PKG_CHECK_MODULES(GEDIT, gedit-2.8 >= 2.8.0, , 
+-              [PKG_CHECK_MODULES(GEDIT, gedit-2.6 >= 2.6.0)])])
++      PKG_CHECK_MODULES(GEDIT, gedit-2.12 >= 2.12.0, ,
++              [PKG_CHECK_MODULES(GEDIT, gedit-2.10 >= 2.9.0, , 
++              [PKG_CHECK_MODULES(GEDIT, gedit-2.8 >= 2.8.0, , 
++                      [PKG_CHECK_MODULES(GEDIT, gedit-2.6 >= 2.6.0)])])])
+       
+       AC_SUBST(GEDIT_CFLAGS)
+ fi

diff --git a/app-crypt/seahorse/seahorse-0.7.9.ebuild b/app-crypt/seahorse/seahorse-0.7.9.ebuild
index db7dc44009c1ce92e233146170cc4f9e2cef4235..d9450a177dddc59fb5f3214a1577b198e553d346 100644 (file)
--- a/app-crypt/seahorse/seahorse-0.7.9.ebuild
+++ b/app-crypt/seahorse/seahorse-0.7.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.7.9.ebuild,v 1.2 2005/07/29 23:13:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.7.9.ebuild,v 1.3 2005/09/18 04:17:16 obz Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils autotools
 
 DESCRIPTION="gnome front end to gnupg"
 HOMEPAGE="http://seahorse.sourceforge.net/"
@@ -37,6 +37,18 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
 IUSE="ldap"
 
+src_unpack() {
+
+       unpack ${A}
+       cd ${S}
+       # Apply patch to allow seahorse-0.7.9 to compile with
+       # gedit-2.12. See bug #106133, <obz@gentoo.org>
+       epatch ${FILESDIR}/${P}-gedit-2.12.patch
+       # Re-configure
+       eautoconf
+
+}
+
 src_compile() {
        # autoconf
        # note below doesn't work - need to fix