Corrective patch for docbook errors. Closes bug #46692.

7 files changed, 40 insertions, 17 deletions

diff --git a/net-libs/linc/ChangeLog b/net-libs/linc/ChangeLog
index f91a19c4d28a..a1ac54fc24e7 100644
--- a/net-libs/linc/ChangeLog
+++ b/net-libs/linc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/linc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/ChangeLog,v 1.27 2003/10/23 14:12:44 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/ChangeLog,v 1.28 2004/04/06 04:15:35 leonardop Exp $
+
+  05 Apr 2004; L. Boshell <leonardop@gentoo.org> linc-1.0.3.ebuild,
+  files/linc-1.0.3-gtkdoc_fix.patch:
+  Added patch to avoid a conflict with docbook IDs. Closes bug #46692.
 
   23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> linc-1.0.3.ebuild:
   set ppc in keywords
diff --git a/net-libs/linc/Manifest b/net-libs/linc/Manifest
index fc8e1e99375a..05e1923859ff 100644
--- a/net-libs/linc/Manifest
+++ b/net-libs/linc/Manifest
@@ -1,10 +1,11 @@
-MD5 e796fa18eabe60e93cd9d96635d73ec9 ChangeLog 3036
-MD5 668ae6b641bbc670be7b4b5a460f9f58 linc-0.5.3.ebuild 1038
-MD5 a98843ba714ebc4e317a0b7c20cc0dac linc-1.0.2.ebuild 719
-MD5 06fd25910dcf33cd174d885f82da360d linc-1.0.1.ebuild 980
-MD5 cd12ddcbfc99a7f1c9b8a72b77f9543a linc-1.0.3.ebuild 715
+MD5 2d4904bd14de9352e115cefcd26a9880 ChangeLog 3218
+MD5 cba509b15a7079533465aaf27a2f6a92 linc-1.0.1.ebuild 981
+MD5 f3165247b89047713f4ca2fda0d4fed5 linc-1.0.2.ebuild 720
+MD5 d68fe73f40aa8334bfc5dee5e1302a3e linc-0.5.3.ebuild 1039
+MD5 fdc25497bdbcfb1a87d2f5c64fd4ecbb linc-1.0.3.ebuild 846
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 849abb9b4b0efe758a7c605ee6fdcc28 files/digest-linc-1.0.1 63
 MD5 ed76b31cb561c75e5398d4553da01c78 files/digest-linc-1.0.2 63
-MD5 c1565e5184f320c1ff18be5523156022 files/digest-linc-0.5.3 63
 MD5 8faa9984d1b8e8142772156db89c528f files/digest-linc-1.0.3 63
-MD5 849abb9b4b0efe758a7c605ee6fdcc28 files/digest-linc-1.0.1 63
+MD5 c1565e5184f320c1ff18be5523156022 files/digest-linc-0.5.3 63
+MD5 805618d4a68f26f5a476961608ac98d7 files/linc-1.0.3-gtkdoc_fix.patch 384
diff --git a/net-libs/linc/files/linc-1.0.3-gtkdoc_fix.patch b/net-libs/linc/files/linc-1.0.3-gtkdoc_fix.patch
new file mode 100644
index 000000000000..9535d546aa9a
--- /dev/null
+++ b/net-libs/linc/files/linc-1.0.3-gtkdoc_fix.patch
@@ -0,0 +1,11 @@
+diff -NurB linc-1.0.3-orig/docs/linc-sections.txt linc-1.0.3/docs/linc-sections.txt
+--- linc-1.0.3-orig/docs/linc-sections.txt	2004-04-05 22:51:42.000000000 -0500
++++ linc-1.0.3/docs/linc-sections.txt	2004-04-05 22:56:48.000000000 -0500
+@@ -46,7 +46,6 @@
+ <FILE>linc-types</FILE>
+ LINCConnectionOptions
+ LincWatch
+-LINCProtocolInfo
+ LINC_MUTEX_LOCK
+ LINC_MUTEX_UNLOCK
+ linc_mutex_new
diff --git a/net-libs/linc/linc-0.5.3.ebuild b/net-libs/linc/linc-0.5.3.ebuild
index 653aebb62ea5..215cac8aca8b 100644
--- a/net-libs/linc/linc-0.5.3.ebuild
+++ b/net-libs/linc/linc-0.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-0.5.3.ebuild,v 1.10 2003/09/11 01:25:54 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-0.5.3.ebuild,v 1.11 2004/04/06 04:15:35 leonardop Exp $
 
 IUSE="doc"
 
diff --git a/net-libs/linc/linc-1.0.1.ebuild b/net-libs/linc/linc-1.0.1.ebuild
index 2b54e74f6e08..e23376b1873d 100644
--- a/net-libs/linc/linc-1.0.1.ebuild
+++ b/net-libs/linc/linc-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-1.0.1.ebuild,v 1.8 2003/09/11 01:25:54 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-1.0.1.ebuild,v 1.9 2004/04/06 04:15:35 leonardop Exp $
 
 IUSE="doc ssl"
 
diff --git a/net-libs/linc/linc-1.0.2.ebuild b/net-libs/linc/linc-1.0.2.ebuild
index f92feb2d4945..a0ccd5f67748 100644
--- a/net-libs/linc/linc-1.0.2.ebuild
+++ b/net-libs/linc/linc-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-1.0.2.ebuild,v 1.4 2003/09/06 22:04:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-1.0.2.ebuild,v 1.5 2004/04/06 04:15:35 leonardop Exp $
 
 IUSE="doc ssl"
 
diff --git a/net-libs/linc/linc-1.0.3.ebuild b/net-libs/linc/linc-1.0.3.ebuild
index 0f68a3dd0871..6455b51dbd12 100644
--- a/net-libs/linc/linc-1.0.3.ebuild
+++ b/net-libs/linc/linc-1.0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-1.0.3.ebuild,v 1.7 2003/09/23 16:10:23 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-1.0.3.ebuild,v 1.8 2004/04/06 04:15:35 leonardop Exp $
 
 IUSE="doc ssl"
 
-inherit gnome2
+inherit eutils gnome2
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A library to ease the writing of networked applications"
@@ -25,3 +25,10 @@ G2CONF="${G2CONF} $(use_with ssl openssl)"
 
 DOCS="AUTHORS ChangeLog COPYING HACKING MAINTAINERS README* NEWS TODO"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Avoid docbook conflicts. See bug #46692.
+	epatch ${FILESDIR}/${P}-gtkdoc_fix.patch
+}