version bump

9 files changed, 104 insertions, 6 deletions

diff --git a/app-editors/conglomerate/ChangeLog b/app-editors/conglomerate/ChangeLog
index 8a08b5fe82d1..0b80aa456cea 100644
--- a/app-editors/conglomerate/ChangeLog
+++ b/app-editors/conglomerate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/conglomerate
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/ChangeLog,v 1.5 2004/02/04 16:36:52 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/ChangeLog,v 1.6 2004/02/18 10:25:17 liquidx Exp $
+
+*conglomerate-0.7.12 (18 Feb 2004)
+
+  18 Feb 2004; Alastair Tse <liquidx@gentoo.org> conglomerate-0.7.11.ebuild,
+  conglomerate-0.7.12.ebuild:
+  version bump
 
 *conglomerate-0.7.11 (04 Feb 2004)
 
diff --git a/app-editors/conglomerate/Manifest b/app-editors/conglomerate/Manifest
index 840d52884185..604c5f8434fa 100644
--- a/app-editors/conglomerate/Manifest
+++ b/app-editors/conglomerate/Manifest
@@ -1,6 +1,8 @@
 MD5 09daa86767b6990c5cacd47a5c5802ed ChangeLog 1033
 MD5 e33ff881c3b7ef85233d371f82c504b0 conglomerate-0.7.11.ebuild 754
+MD5 e33ff881c3b7ef85233d371f82c504b0 conglomerate-0.7.12.ebuild 754
 MD5 69ade4338ad75332faf777b5f7c1c468 conglomerate-0.7.6.ebuild 752
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 ca4bf14acc138133a52ec9e6e928df7c files/digest-conglomerate-0.7.11 72
+MD5 dd358fac32b5fbbad6105b35e34845ed files/digest-conglomerate-0.7.12 72
 MD5 8e52ee09f46fb63615d44da7e9759b5f files/digest-conglomerate-0.7.6 71
diff --git a/app-editors/conglomerate/conglomerate-0.7.11.ebuild b/app-editors/conglomerate/conglomerate-0.7.11.ebuild
index eea43ac89b13..0477f6d3bd27 100644
--- a/app-editors/conglomerate/conglomerate-0.7.11.ebuild
+++ b/app-editors/conglomerate/conglomerate-0.7.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.11.ebuild,v 1.1 2004/02/04 16:36:52 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.11.ebuild,v 1.2 2004/02/18 10:25:17 liquidx Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="doc"
 
 RDEPEND="dev-libs/libxml2
diff --git a/app-editors/conglomerate/conglomerate-0.7.12.ebuild b/app-editors/conglomerate/conglomerate-0.7.12.ebuild
new file mode 100644
index 000000000000..ddc968b02264
--- /dev/null
+++ b/app-editors/conglomerate/conglomerate-0.7.12.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.12.ebuild,v 1.1 2004/02/18 10:25:17 liquidx Exp $
+
+inherit gnome2
+
+DESCRIPTION="XML editor"
+HOMEPAGE="http://www.conglomerate.org/"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc"
+
+RDEPEND="dev-libs/libxml2
+	dev-libs/libxslt
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonoboui-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2
+	>=x11-libs/gtksourceview-0.6"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-0.6 )"
+
+DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README* TODO"
diff --git a/app-editors/conglomerate/files/digest-conglomerate-0.7.12 b/app-editors/conglomerate/files/digest-conglomerate-0.7.12
new file mode 100644
index 000000000000..345a15b35f22
--- /dev/null
+++ b/app-editors/conglomerate/files/digest-conglomerate-0.7.12
@@ -0,0 +1 @@
+MD5 8743f9d8f079fc22f6aef70efd838aac conglomerate-0.7.12.tar.gz 1996197
diff --git a/x11-libs/gtkscintilla2/ChangeLog b/x11-libs/gtkscintilla2/ChangeLog
index 29a472855c57..9a9548a36f1f 100644
--- a/x11-libs/gtkscintilla2/ChangeLog
+++ b/x11-libs/gtkscintilla2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtkscintilla2
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkscintilla2/ChangeLog,v 1.4 2003/12/13 22:36:45 zul Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkscintilla2/ChangeLog,v 1.5 2004/02/18 10:25:48 liquidx Exp $
+
+*gtkscintilla2-0.1.0 (18 Feb 2004)
+
+  18 Feb 2004; Alastair Tse <liquidx@gentoo.org> gtkscintilla2-0.1.0.ebuild:
+  version bump
 
   13 Dec 2003; Chuck Short <zul@gentoo.org> gtkscintilla2-0.0.8.ebuild:
   Added amd64 support.
diff --git a/x11-libs/gtkscintilla2/Manifest b/x11-libs/gtkscintilla2/Manifest
index 27d94ed5b713..f6033e9ad2e3 100644
--- a/x11-libs/gtkscintilla2/Manifest
+++ b/x11-libs/gtkscintilla2/Manifest
@@ -1,4 +1,6 @@
-MD5 0e83f40e31445d895ecd78c2d8d150c6 gtkscintilla2-0.0.8.ebuild 1137
 MD5 34de6c8b5452e261d98f99a945eaf127 ChangeLog 872
+MD5 0e83f40e31445d895ecd78c2d8d150c6 gtkscintilla2-0.0.8.ebuild 1137
+MD5 fe2794211f6b770f898b40ecec9014e3 gtkscintilla2-0.1.0.ebuild 1145
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 f29bb40add3aa939317a482a5351a3fd files/digest-gtkscintilla2-0.0.8 71
+MD5 dc9e42bf3ab4148baffc1e474a266416 files/digest-gtkscintilla2-0.1.0 71
diff --git a/x11-libs/gtkscintilla2/files/digest-gtkscintilla2-0.1.0 b/x11-libs/gtkscintilla2/files/digest-gtkscintilla2-0.1.0
new file mode 100644
index 000000000000..fb93fc765fb5
--- /dev/null
+++ b/x11-libs/gtkscintilla2/files/digest-gtkscintilla2-0.1.0
@@ -0,0 +1 @@
+MD5 7e1a5b6c289155fae49ccb3a1a43f0b2 GtkScintilla2-0.1.0.tar.gz 489304
diff --git a/x11-libs/gtkscintilla2/gtkscintilla2-0.1.0.ebuild b/x11-libs/gtkscintilla2/gtkscintilla2-0.1.0.ebuild
new file mode 100644
index 000000000000..4c9f560d622d
--- /dev/null
+++ b/x11-libs/gtkscintilla2/gtkscintilla2-0.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkscintilla2/gtkscintilla2-0.1.0.ebuild,v 1.1 2004/02/18 10:25:48 liquidx Exp $
+
+MY_P="GtkScintilla2-${PV}"
+DESCRIPTION="Gtk-2 wrappers for the Scintilla source editing components."
+HOMEPAGE="http://www.gphpedit.org/"
+SRC_URI="http://gphpedit.org/download/files/${MY_P}.tar.gz"
+
+IUSE=""
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+LICENSE="GPL-2"
+
+RDEPEND=">=x11-libs/gtk+-2.0"
+
+DEPEND=">=dev-util/pkgconfig-0.12.0
+	>=dev-lang/python-2.2
+	${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# some quick touches to the Makefile, bump the version
+	# and make use of our CFLAGS
+	cp Makefile Makefile.orig
+	sed -e "/VERSION/s/0.0.3/${PV}/" \
+		-e "/CFLAGS/s/-g/${CFLAGS} -fPIC/" < Makefile.orig > Makefile
+
+	# and again, in the scintilla part
+	cd ${S}/scintilla/gtk
+	cp makefile makefile.orig
+	sed -e "/CXXFLAGS/s/-Os/${CFLAGS} -fPIC/" < makefile.orig > makefile
+
+}
+
+src_compile() {
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+	dodoc COPYING README
+
+}