version bump. fixes GTK1 default thanks to Piotr Piasny <p1t3r05 os.pl> and khai <khai turbonet.com> (#40866) (#40668)

7 files changed, 27 insertions, 67 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 08803e65e705..c89fe24ce473 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/scite
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.15 2004/01/09 01:41:11 liquidx Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.16 2004/02/11 10:39:14 liquidx Exp $
+
+*scite-1.5.8 (11 Feb 2004)
+
+  11 Feb 2004; Alastair Tse <liquidx@gentoo.org> scite-1.5.1.ebuild,
+  scite-1.5.4.ebuild, scite-1.5.8.ebuild:
+  version bump. fixes GTK1 default thanks to Piotr Piasny <p1t3r05 os.pl> and
+  khai <khai turbonet.com> (#40866) (#40668)
 
 *scite-1.5.7 (09 Jan 2004)
 
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index b1a928b5483f..958f98c73990 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,13 +1,11 @@
-MD5 1ae97d38cf35b8da0f5a304408836eb4 ChangeLog 2614
+MD5 857dcb07b469769e11aeb540772b859a ChangeLog 2877
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 MD5 9b99c735833410c4d863b47c0ee61d60 scite-1.4.9.ebuild 1329
-MD5 7954463b548282c780a5674346e39c54 scite-1.5.1.ebuild 1330
-MD5 eb336b16dcbf235faeb51eabf76314a1 scite-1.5.4.ebuild 1680
 MD5 5c10170a5cd8fee591a4c281885f9924 scite-1.5.6.ebuild 1680
 MD5 de4f87d5c62c547a2fa6d4b5f6900f77 scite-1.5.7.ebuild 1864
+MD5 ef049760db1a6d3b6f0a07c79b9d2799 scite-1.5.8.ebuild 1870
 MD5 e21b1647de51e2cea2682beaf5522ea7 files/digest-scite-1.4.9 57
-MD5 9ee947d9de84f03b11e6b1f7f195d87a files/digest-scite-1.5.1 57
-MD5 8f703db06b0c2938ae6349c2970ead59 files/digest-scite-1.5.4 57
 MD5 80608721073d877a62ab114df64994fe files/digest-scite-1.5.6 57
 MD5 db1df48699c3abfa8938d151233eaefc files/digest-scite-1.5.7 57
+MD5 3c64c2bf7e3e5fc10e24e76b905dfdcb files/digest-scite-1.5.8 57
 MD5 2561568c62ec3edc2b46be6638c80427 files/scite.desktop 169
diff --git a/app-editors/scite/files/digest-scite-1.5.1 b/app-editors/scite/files/digest-scite-1.5.1
deleted file mode 100644
index 9393306743fb..000000000000
--- a/app-editors/scite/files/digest-scite-1.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 71439397367fae2bd92b74f63144e74f scite151.tgz 785046
diff --git a/app-editors/scite/files/digest-scite-1.5.4 b/app-editors/scite/files/digest-scite-1.5.4
deleted file mode 100644
index 8b10cce4c6f5..000000000000
--- a/app-editors/scite/files/digest-scite-1.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5086acda2bb7a637fc34b0655e30930e scite154.tgz 840583
diff --git a/app-editors/scite/files/digest-scite-1.5.8 b/app-editors/scite/files/digest-scite-1.5.8
new file mode 100644
index 000000000000..fa0cf4d2152f
--- /dev/null
+++ b/app-editors/scite/files/digest-scite-1.5.8
@@ -0,0 +1 @@
+MD5 0f704b40f07aba44205621a19245847c scite158.tgz 912348
diff --git a/app-editors/scite/scite-1.5.1.ebuild b/app-editors/scite/scite-1.5.1.ebuild
deleted file mode 100644
index 290a9238245e..000000000000
--- a/app-editors/scite/scite-1.5.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.5.1.ebuild,v 1.3 2003/09/05 23:05:05 msterret Exp $
-
-S=${WORKDIR}/$PN/gtk
-MY_PV=151
-DESCRIPTION="A very powerful editor for programmers"
-SRC_URI="http://www.scintilla.org/${PN}${MY_PV}.tgz"
-HOMEPAGE="http://www.scintilla.org"
-
-DEPEND="virtual/glibc
-	=x11-libs/gtk+-1.2*"
-RDEPEND=""
-
-SLOT="0"
-LICENSE="PYTHON"
-KEYWORDS="x86 ~ppc ~sparc"
-
-src_compile() {
-	make -C ../../scintilla/gtk || die
-	sed -e 's#usr/local#usr#g' -e 's#$(datadir)#${D}$(datadir)#g' \
-		makefile > Makefile.good || die
-	mv Makefile.good makefile
-	sed -e 's#Exec=SciTE#Exec=scite#g' \
-		-e 's#Type=Application#Type=Development#g' \
-		SciTE.desktop > SciTE.desktop.good
-	mv SciTE.desktop.good SciTE.desktop
-	emake || die
-}
-
-src_install () {
-	dodir /usr
-	dodir /usr/bin
-	dodir /usr/share
-	dodir /usr/share/pixmaps
-	dodir /usr/share/gnome/apps/Applications
-	make prefix=${D}/usr install || die
-	mv ${D}/usr/bin/SciTE ${D}/usr/bin/scite
-	doman ../doc/scite.1
-	dodoc ../License.txt ../readme
-
-	if use gnome ;
-	then
-		# fix category (this is a developers tool)
-		mv ${D}/usr/share/gnome/apps/Applications \
-			${D}/usr/share/gnome/apps/Development
-	else
-		rm -rf ${D}/usr/share/gnome
-	fi
-}
-
diff --git a/app-editors/scite/scite-1.5.4.ebuild b/app-editors/scite/scite-1.5.8.ebuild
index 82f953e71689..f5f9db5af2b1 100644
--- a/app-editors/scite/scite-1.5.4.ebuild
+++ b/app-editors/scite/scite-1.5.8.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/app-editors/scite/scite-1.5.4.ebuild,v 1.5 2003/10/13 20:27:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.5.8.ebuild,v 1.1 2004/02/11 10:39:14 liquidx Exp $
 
 
 MY_PV=$(echo ${PV} | sed 's:\.::g')
@@ -9,34 +9,41 @@ DESCRIPTION="A very powerful editor for programmers"
 SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 HOMEPAGE="http://www.scintilla.org"
 
-DEPEND="gtk2? ( >=x11-libs/gtk+-2 ) : ( =x11-libs/gtk+-1.2* )
+DEPEND="gtk2? ( >=x11-libs/gtk+-2 )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
 	>=sys-apps/sed-4"
 
 S=${WORKDIR}/${PN}/gtk
 
 SLOT="0"
 LICENSE="PYTHON"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc"
 IUSE="gtk2 gnome"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd ${WORKDIR}/scintilla/gtk
+	sed -i makefile \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		|| die "error patching makefile"
 
+	cd ${S}
 	sed -i makefile \
 		-e 's#usr/local#usr#g' \
-		-e 's#$(datadir)#${D}$(datadir)#g' \
 		-e 's#/gnome/apps/Applications#/applications#' \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
 		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e 's#${D}##' \
 		|| die "error patching makefile"
 
 }
 
 src_compile() {
 	local makeopts
-	use gtk2 && makeopts="GTK2=1"
+	use gtk2 || makeopts="GTK1=1"
 	#use debug && makeopts="${makeopts} DEBUG=1"
 
 	make -C ../../scintilla/gtk ${makeopts}  || die "prep make failed"