Revision bump to make use of new monodoc/mono-tools layout and remove one older unused version.

Package-Manager: portage-2.1_pre3-r1

7 files changed, 134 insertions, 64 deletions

diff --git a/dev-dotnet/gtksourceview-sharp/ChangeLog b/dev-dotnet/gtksourceview-sharp/ChangeLog
index 231385e10c08..e0c7960cbb5a 100644
--- a/dev-dotnet/gtksourceview-sharp/ChangeLog
+++ b/dev-dotnet/gtksourceview-sharp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-dotnet/gtksourceview-sharp
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtksourceview-sharp/ChangeLog,v 1.28 2005/11/18 13:20:34 herbs Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtksourceview-sharp/ChangeLog,v 1.29 2006/01/21 19:50:37 latexer Exp $
+
+*gtksourceview-sharp-0.10-r1 (21 Jan 2006)
+
+  21 Jan 2006; Peter Johanson <latexer@gentoo.org>
+  +files/gtksourceview-sharp-0.10-monodoc-update.diff,
+  -gtksourceview-sharp-0.5-r2.ebuild, +gtksourceview-sharp-0.10-r1.ebuild:
+  Revision bump to make use of new monodoc/mono-tools layout and remove one
+  older unused version.
 
   18 Nov 2005; Herbie Hopkins <herbs@gentoo.org>
   gtksourceview-sharp-0.5-r2.ebuild, gtksourceview-sharp-0.10.ebuild:
diff --git a/dev-dotnet/gtksourceview-sharp/Manifest b/dev-dotnet/gtksourceview-sharp/Manifest
index ed835d450c7a..804fa81cc689 100644
--- a/dev-dotnet/gtksourceview-sharp/Manifest
+++ b/dev-dotnet/gtksourceview-sharp/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 093248e1c469cfb3c6eeb2e71135494d ChangeLog 3970
+MD5 11922afa1fa6f1bda5abc1ae0f2c81ce ChangeLog 4298
 MD5 8af6fb8343aac37fbf1f96ed916b72fc files/digest-gtksourceview-sharp-0.10 80
-MD5 099781a1b5a2aa2f4543d2e1dc9677d0 files/digest-gtksourceview-sharp-0.5-r2 75
+MD5 8af6fb8343aac37fbf1f96ed916b72fc files/digest-gtksourceview-sharp-0.10-r1 80
+MD5 43a0354fb80ec9be4afcec43b96f5f0d files/gtksourceview-sharp-0.10-monodoc-update.diff 2198
+MD5 e8395809a6089ea9992f50dbdbd364fd gtksourceview-sharp-0.10-r1.ebuild 1495
 MD5 f061c888b50bbf398c11164df6786398 gtksourceview-sharp-0.10.ebuild 1317
-MD5 dfe1a74aaff693418e1aebca08badd8f gtksourceview-sharp-0.5-r2.ebuild 1316
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDfdUw2G5bA0cA/ScRAnjZAJ9YlMf3BzZpduMlgQ7Q7Lvck9ry6wCfSeNQ
-agqnZ/9OnkLPQBUlThEZN3I=
-=EbB6
------END PGP SIGNATURE-----
diff --git a/dev-dotnet/gtksourceview-sharp/files/digest-gtksourceview-sharp-0.10-r1 b/dev-dotnet/gtksourceview-sharp/files/digest-gtksourceview-sharp-0.10-r1
new file mode 100644
index 000000000000..f22e701eebdb
--- /dev/null
+++ b/dev-dotnet/gtksourceview-sharp/files/digest-gtksourceview-sharp-0.10-r1
@@ -0,0 +1 @@
+MD5 2179634b8931e6be849a1e1f82c834e3 gtksourceview-sharp-2.0-0.10.tar.gz 143608
diff --git a/dev-dotnet/gtksourceview-sharp/files/digest-gtksourceview-sharp-0.5-r2 b/dev-dotnet/gtksourceview-sharp/files/digest-gtksourceview-sharp-0.5-r2
deleted file mode 100644
index b4821bf3fcf0..000000000000
--- a/dev-dotnet/gtksourceview-sharp/files/digest-gtksourceview-sharp-0.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b82e767e42a542e185a534048db3078d gtksourceview-sharp-0.5.tar.gz 345274
diff --git a/dev-dotnet/gtksourceview-sharp/files/gtksourceview-sharp-0.10-monodoc-update.diff b/dev-dotnet/gtksourceview-sharp/files/gtksourceview-sharp-0.10-monodoc-update.diff
new file mode 100644
index 000000000000..788d75a30e0c
--- /dev/null
+++ b/dev-dotnet/gtksourceview-sharp/files/gtksourceview-sharp-0.10-monodoc-update.diff
@@ -0,0 +1,58 @@
+diff -aur gtksourceview-sharp-2.0-0.10-orig/configure.in gtksourceview-sharp-2.0-0.10/configure.in
+--- gtksourceview-sharp-2.0-0.10-orig/configure.in	2005-05-14 13:19:45.000000000 -0700
++++ gtksourceview-sharp-2.0-0.10/configure.in	2006-01-21 11:16:13.000000000 -0800
+@@ -98,18 +98,21 @@
+ fi
+ AC_SUBST(GAPI_CODEGEN)
+ 
+-MONODOC_REQUIRED_VERSION=1.0
++MONODOC_REQUIRED_VERSION=1.1.8
+ PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no)
+                                                                                 
+ if test "x$enable_monodoc" = "xyes"; then 
+-    AC_PATH_PROG(MONODOC, monodoc, no)
+-    if test "x$MONODOC" = "xno"; then
++    AC_PATH_PROG(MONODOCER, monodocer, no)
++    AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
++    if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
+        enable_monodoc=no
+     fi
+ else
+-    MONODOC=
++    MONODOCER=
++    MDASSEMBLER=
+ fi
+-AC_SUBST(MONODOC)
++AC_SUBST(MONODOCER)
++AC_SUBST(MDASSEMBLER)
+ 
+ API_VERSION="1.0.0.2"
+ AC_SUBST(API_VERSION)
+diff -aur gtksourceview-sharp-2.0-0.10-orig/doc/Makefile.am gtksourceview-sharp-2.0-0.10/doc/Makefile.am
+--- gtksourceview-sharp-2.0-0.10-orig/doc/Makefile.am	2004-06-06 16:01:25.000000000 -0700
++++ gtksourceview-sharp-2.0-0.10/doc/Makefile.am	2006-01-21 11:36:00.000000000 -0800
+@@ -1,6 +1,6 @@
+ if ENABLE_MONODOC
+ TARGETS = gtksourceview-sharp-docs.zip gtksourceview-sharp-docs.tree gtksourceview-sharp-docs.source
+-docsdir = `$(MONODOC) --get-sourcesdir`
++docsdir = `$(PKG_CONFIG) --variable=sourcesdir monodoc`
+ docs_DATA = $(TARGETS)
+ else
+ TARGETS = 
+@@ -9,14 +9,11 @@
+ endif
+ 
+ 
+-ASSEMBLER = $(MONODOC) --assemble
+-UPDATER = $(MONODOC) --update
+-
+ gtksourceview-sharp-docs.zip gtksourceview-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
+-	$(ASSEMBLER) --ecma $(srcdir)/en -o gtksourceview-sharp-docs
++	$(MDASSEMBLER) --ecma $(srcdir)/en -o gtksourceview-sharp-docs
+ 
+ update:
+-		$(UPDATER) ../gtksourceview/gtksourceview-sharp.dll -o ./en -f
++		$(MONODOCER) -assembly:../gtksourceview/gtksourceview-sharp.dll -path:en -updateto:en -delete
+ 
+ CLEANFILES = gtksourceview-sharp-docs.zip gtksourceview-sharp-docs.tree
+ 
diff --git a/dev-dotnet/gtksourceview-sharp/gtksourceview-sharp-0.10-r1.ebuild b/dev-dotnet/gtksourceview-sharp/gtksourceview-sharp-0.10-r1.ebuild
new file mode 100644
index 000000000000..fc0b3659d1b2
--- /dev/null
+++ b/dev-dotnet/gtksourceview-sharp/gtksourceview-sharp-0.10-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtksourceview-sharp/gtksourceview-sharp-0.10-r1.ebuild,v 1.1 2006/01/21 19:50:37 latexer Exp $
+
+inherit mono multilib eutils
+
+MY_P="${P/${PN}/${PN}-2.0}"
+
+DESCRIPTION="A C# Binding to gtksourceview"
+HOMEPAGE="http://www.go-mono.com/"
+SRC_URI="http://www.go-mono.com/sources/${PN}-2.0/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=dev-lang/mono-1.0
+	>=dev-dotnet/gtk-sharp-2.4.0
+	>=dev-dotnet/gnome-sharp-2.4.0
+	>=x11-libs/gtksourceview-1.2.0"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/automake
+	sys-devel/autoconf
+	>=dev-util/monodoc-1.1.8"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-monodoc-update.diff
+
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e 's:$(prefix)/lib:$(libdir):' \
+			-e 's:${prefix}/lib:${libdir}:' \
+			${S}/Makefile.{am,in} ${S}/*.pc.in || die
+	fi
+
+	aclocal || die
+	automake || die
+	autoconf || die
+
+}
+
+src_compile() {
+	econf || die "./configure failed!"
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	dodir $(pkg-config --variable=sourcesdir monodoc)
+	make GACUTIL_FLAGS="/root ${D}/usr/$(get_libdir) /gacdir /usr/$(get_libdir) -package gtksourceview-sharp-2.0" \
+		DESTDIR=${D} install || die
+
+	# newer gtksourceview versions install these
+	rm ${D}/usr/share/gtksourceview-1.0/language-specs/{vbnet,nemerle}.lang
+}
diff --git a/dev-dotnet/gtksourceview-sharp/gtksourceview-sharp-0.5-r2.ebuild b/dev-dotnet/gtksourceview-sharp/gtksourceview-sharp-0.5-r2.ebuild
deleted file mode 100644
index a79679fd69e5..000000000000
--- a/dev-dotnet/gtksourceview-sharp/gtksourceview-sharp-0.5-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtksourceview-sharp/gtksourceview-sharp-0.5-r2.ebuild,v 1.3 2005/11/18 13:20:34 herbs Exp $
-
-inherit mono multilib
-
-DESCRIPTION="A C# Binding to gtksourceview"
-HOMEPAGE="http://www.go-mono.com/"
-SRC_URI="http://www.go-mono.com/archive/1.0/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-lang/mono-1.0
-		>=dev-dotnet/gtk-sharp-1.0.4-r1
-		>=dev-dotnet/gnome-sharp-1.0.4
-		=dev-dotnet/gtk-sharp-1.0*
-		=dev-dotnet/gnome-sharp-1.0*
-		>=x11-libs/gtksourceview-1.2.0"
-
-
-src_unpack() {
-	unpack ${A}
-	sed -i "s:\`monodoc:${D}\`monodoc:" ${S}/doc/Makefile.in
-
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e 's:@prefix@/lib:@libdir@:' \
-			-e 's:^libdir.*:libdir=@libdir@:' \
-			${S}/makefile.{am,in} ${S}/*.pc.in || die
-	fi
-}
-
-src_compile() {
-	econf || die "./configure failed!"
-	MAKEOPTS="-j1" make || die "make failed"
-}
-
-src_install() {
-	dodir $(monodoc --get-sourcesdir)
-	make GACUTIL_FLAGS="/root ${D}/usr/$(get_libdir) /gacdir /usr/$(get_libdir) -package gtk-sharp" \
-		DESTDIR=${D} install || die
-
-	# newer gtksourceview versions install these
-	rm ${D}/usr/share/gtksourceview-1.0/language-specs/{vbnet,nemerle}.lang
-}