Changed to correct license. Switched to upstream versioning. Version bumps.

(Portage version: 2.0.51.22-r1)

12 files changed, 181 insertions, 14 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 741e79848805..310292fa69ca 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-editors/scite
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.39 2005/04/21 18:27:34 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.40 2005/08/04 17:15:11 pythonhead Exp $
+
+*scite-1.65 (04 Aug 2005)
+*scite-1.64 (04 Aug 2005)
+*scite-1.63 (04 Aug 2005)
+*scite-1.62 (04 Aug 2005)
+*scite-1.61 (04 Aug 2005)
+
+  04 Aug 2005; Rob Cakebread <pythonhead@gentoo.org> -scite-1.6.1.ebuild,
+  -scite-1.6.2.ebuild, -scite-1.6.3.ebuild, +scite-1.61.ebuild,
+  +scite-1.62.ebuild, +scite-1.63.ebuild, +scite-1.64.ebuild,
+  +scite-1.65.ebuild:
+  Changed to correct license. Switched to upstream versioning. Version bumps.
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> scite-1.6.2.ebuild:
   stable on amd64
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index e70bb40556fd..60edbe38a081 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,9 +1,13 @@
-MD5 987e8ef3eae83a0e405c1bd12acc8c7b ChangeLog 6442
+MD5 61c56639bf786c985c8db2e1a98b5f68 ChangeLog 6874
 MD5 4eb1abff335478b86f5c65997e0148f2 metadata.xml 222
-MD5 46e756e5ecd7701d47299d6e6bb37018 scite-1.6.1.ebuild 1895
-MD5 108bc5ebc97b562e60f85defb77d2ccd scite-1.6.2.ebuild 1895
-MD5 bdead83df0cdc4e6f88dec59c5198349 scite-1.6.3.ebuild 1904
-MD5 c022b3ac9b612f257e304f7f90eb7f98 files/digest-scite-1.6.1 58
-MD5 42ceb479aebfc9cd9818f0d6a0e39020 files/digest-scite-1.6.2 58
+MD5 1904afb3966ac533785d7efb6d384dcc scite-1.61.ebuild 1898
+MD5 55433c20277daff9b606223519a57301 scite-1.62.ebuild 1898
+MD5 46a4e1ea2d905bdbf7879a605136aaf7 scite-1.63.ebuild 1907
+MD5 46a4e1ea2d905bdbf7879a605136aaf7 scite-1.64.ebuild 1907
+MD5 75b15211aef5960a79356d2b337d8e6d scite-1.65.ebuild 1906
+MD5 c022b3ac9b612f257e304f7f90eb7f98 files/digest-scite-1.61 58
+MD5 42ceb479aebfc9cd9818f0d6a0e39020 files/digest-scite-1.62 58
+MD5 908c010850e453c17c24a7cefd399a63 files/digest-scite-1.63 58
+MD5 6b68b046beca294c3e6c47715b936738 files/digest-scite-1.64 58
+MD5 817229017073163998b48d9e8367d0ed files/digest-scite-1.65 58
 MD5 2561568c62ec3edc2b46be6638c80427 files/scite.desktop 169
-MD5 908c010850e453c17c24a7cefd399a63 files/digest-scite-1.6.3 58
diff --git a/app-editors/scite/files/digest-scite-1.6.1 b/app-editors/scite/files/digest-scite-1.61
index 923f76b0d129..923f76b0d129 100644
--- a/app-editors/scite/files/digest-scite-1.6.1
+++ b/app-editors/scite/files/digest-scite-1.61
diff --git a/app-editors/scite/files/digest-scite-1.6.2 b/app-editors/scite/files/digest-scite-1.62
index edd7f730c214..edd7f730c214 100644
--- a/app-editors/scite/files/digest-scite-1.6.2
+++ b/app-editors/scite/files/digest-scite-1.62
diff --git a/app-editors/scite/files/digest-scite-1.6.3 b/app-editors/scite/files/digest-scite-1.63
index 40e65586e3d5..40e65586e3d5 100644
--- a/app-editors/scite/files/digest-scite-1.6.3
+++ b/app-editors/scite/files/digest-scite-1.63
diff --git a/app-editors/scite/files/digest-scite-1.64 b/app-editors/scite/files/digest-scite-1.64
new file mode 100644
index 000000000000..8412aa740ca3
--- /dev/null
+++ b/app-editors/scite/files/digest-scite-1.64
@@ -0,0 +1 @@
+MD5 745860eb91d3a2d65288856e52ab03a5 scite164.tgz 1227728
diff --git a/app-editors/scite/files/digest-scite-1.65 b/app-editors/scite/files/digest-scite-1.65
new file mode 100644
index 000000000000..6365d1d753a4
--- /dev/null
+++ b/app-editors/scite/files/digest-scite-1.65
@@ -0,0 +1 @@
+MD5 cb540f32665ca052f3167f2dd933807b scite165.tgz 1230655
diff --git a/app-editors/scite/scite-1.6.1.ebuild b/app-editors/scite/scite-1.61.ebuild
index 10442f63559c..fa34535ad98b 100644
--- a/app-editors/scite/scite-1.6.1.ebuild
+++ b/app-editors/scite/scite-1.61.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.6.1.ebuild,v 1.10 2005/01/01 13:34:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.61.ebuild,v 1.1 2005/08/04 17:15:11 pythonhead Exp $
 
 inherit toolchain-funcs
 
@@ -9,7 +9,7 @@ DESCRIPTION="A very powerful editor for programmers"
 HOMEPAGE="http://www.scintilla.org"
 SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
-LICENSE="PYTHON"
+LICENSE="Scintilla"
 SLOT="0"
 KEYWORDS="ppc sparc x86"
 IUSE="gtk2 lua"
diff --git a/app-editors/scite/scite-1.6.2.ebuild b/app-editors/scite/scite-1.62.ebuild
index 8a242c598dc1..9488e31307f3 100644
--- a/app-editors/scite/scite-1.6.2.ebuild
+++ b/app-editors/scite/scite-1.62.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.6.2.ebuild,v 1.7 2005/04/21 18:27:34 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.62.ebuild,v 1.1 2005/08/04 17:15:11 pythonhead Exp $
 
 inherit toolchain-funcs
 
@@ -9,7 +9,7 @@ DESCRIPTION="A very powerful editor for programmers"
 HOMEPAGE="http://www.scintilla.org"
 SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
-LICENSE="PYTHON"
+LICENSE="Scintilla"
 SLOT="0"
 KEYWORDS="ppc sparc x86 amd64"
 IUSE="gtk2 lua"
diff --git a/app-editors/scite/scite-1.6.3.ebuild b/app-editors/scite/scite-1.63.ebuild
index d520c21830cb..0465cf073e5e 100644
--- a/app-editors/scite/scite-1.6.3.ebuild
+++ b/app-editors/scite/scite-1.63.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.6.3.ebuild,v 1.2 2005/04/06 00:44:52 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.63.ebuild,v 1.1 2005/08/04 17:15:11 pythonhead Exp $
 
 inherit toolchain-funcs
 
@@ -9,7 +9,7 @@ DESCRIPTION="A very powerful editor for programmers"
 HOMEPAGE="http://www.scintilla.org"
 SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
-LICENSE="PYTHON"
+LICENSE="Scintilla"
 SLOT="0"
 KEYWORDS="~ppc ~sparc ~x86 ~amd64"
 IUSE="gtk2 lua"
diff --git a/app-editors/scite/scite-1.64.ebuild b/app-editors/scite/scite-1.64.ebuild
new file mode 100644
index 000000000000..b8890492a42b
--- /dev/null
+++ b/app-editors/scite/scite-1.64.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.64.ebuild,v 1.1 2005/08/04 17:15:11 pythonhead Exp $
+
+inherit toolchain-funcs
+
+MY_PV=${PV//./}
+DESCRIPTION="A very powerful editor for programmers"
+HOMEPAGE="http://www.scintilla.org"
+SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
+
+LICENSE="Scintilla"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86 ~amd64"
+IUSE="gtk2 lua"
+
+RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
+	lua? ( >=dev-lang/lua-5 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/${PN}/gtk
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}/scintilla/gtk
+	sed -i makefile \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		|| die "error patching makefile"
+
+	cd ${S}
+	sed -i makefile \
+		-e 's#usr/local#usr#g' \
+		-e 's#/gnome/apps/Applications#/applications#' \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e 's#${D}##' \
+		|| die "error patching makefile"
+
+}
+
+src_compile() {
+	local makeopts
+	use gtk2 || makeopts="GTK1=1"
+	#use debug && makeopts="${makeopts} DEBUG=1"
+
+	make -C ../../scintilla/gtk ${makeopts}  || die "prep make failed"
+	emake ${makeopts} || die "make failed"
+}
+
+src_install() {
+	dodir /usr
+	dodir /usr/bin
+	dodir /usr/share
+	dodir /usr/share/pixmaps
+	dodir /usr/share/applications
+
+	make prefix=${D}/usr install || die
+
+	# we have to keep this because otherwise it'll break upgrading
+	mv ${D}/usr/bin/SciTE ${D}/usr/bin/scite
+	dosym /usr/bin/scite /usr/bin/SciTE
+
+	# replace .desktop file with our own working version
+	insinto /usr/share/applications
+	rm -f ${D}/usr/share/applications/SciTE.desktop
+	doins ${FILESDIR}/scite.desktop
+
+	doman ../doc/scite.1
+	dodoc ../README
+}
diff --git a/app-editors/scite/scite-1.65.ebuild b/app-editors/scite/scite-1.65.ebuild
new file mode 100644
index 000000000000..2734bb13dd81
--- /dev/null
+++ b/app-editors/scite/scite-1.65.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.65.ebuild,v 1.1 2005/08/04 17:15:11 pythonhead Exp $
+
+inherit toolchain-funcs
+
+MY_PV=${PV//./}
+DESCRIPTION="A very powerful editor for programmers"
+HOMEPAGE="http://www.scintilla.org"
+SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
+
+LICENSE="Scintilla"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86 ~amd64"
+IUSE="gtk2 lua"
+
+RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
+	lua? ( >=dev-lang/lua-5 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/${PN}/gtk
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}/scintilla/gtk
+	sed -i makefile \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		|| die "error patching makefile"
+
+	cd ${S}
+	sed -i makefile \
+		-e 's#usr/local#usr#g' \
+		-e 's#/gnome/apps/Applications#/applications#' \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e 's#${D}##' \
+		|| die "error patching makefile"
+}
+
+src_compile() {
+	local makeopts
+	use gtk2 || makeopts="GTK1=1"
+	#use debug && makeopts="${makeopts} DEBUG=1"
+
+	make -C ../../scintilla/gtk ${makeopts}  || die "prep make failed"
+	emake ${makeopts} || die "make failed"
+}
+
+src_install() {
+	dodir /usr
+	dodir /usr/bin
+	dodir /usr/share
+	dodir /usr/share/pixmaps
+	dodir /usr/share/applications
+
+	make prefix=${D}/usr install || die
+
+	# we have to keep this because otherwise it'll break upgrading
+	mv ${D}/usr/bin/SciTE ${D}/usr/bin/scite
+	dosym /usr/bin/scite /usr/bin/SciTE
+
+	# replace .desktop file with our own working version
+	insinto /usr/share/applications
+	rm -f ${D}/usr/share/applications/SciTE.desktop
+	doins ${FILESDIR}/scite.desktop
+
+	doman ../doc/scite.1
+	dodoc ../README
+}