cleanup and re-write. see changelog. #19122 #22362 #26832

10 files changed, 75 insertions, 166 deletions

diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 1bfd167151c4..46a8bdbefd8d 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,13 +1,8 @@
-MD5 546bea91c2a941177bd8d14c5f89ff91 ChangeLog 1803
-MD5 b04c1614b04e836806d799be26eddbc6 scite-1.4.1.ebuild 1014
-MD5 a6110fcd6dab9c88c166fc13db839ad4 scite-1.4.5-r1.ebuild 1524
-MD5 5b64692e3343c59610c54c52d69e6ceb scite-1.4.5.ebuild 1359
+MD5 4b8ee7a703e1b79bf958a538787db7d7 ChangeLog 2085
+MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 MD5 b1eb13875130755fc660b5e6dea4ed1f scite-1.4.9.ebuild 1328
 MD5 5de3cd2adb6333c5450d9eccc9d0e9c6 scite-1.5.1.ebuild 1327
-MD5 39353044acc6dc589cac9c05e1fad585 scite-1.5.4.ebuild 1444
-MD5 8ae3062a71a203afbc74361b227fe260 files/digest-scite-1.4.1 57
-MD5 b7354f25dc5a810f94cd72085bb41f41 files/digest-scite-1.4.5 57
-MD5 53059ddd4233f086b56d573e64701ba4 files/digest-scite-1.4.5-r1 117
+MD5 6e47d41943791d6cb14379b133bbdb56 scite-1.5.4.ebuild 1572
 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
diff --git a/app-editors/scite/files/digest-scite-1.4.1 b/app-editors/scite/files/digest-scite-1.4.1
deleted file mode 100644
index 7245057c7e30..000000000000
--- a/app-editors/scite/files/digest-scite-1.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 750684fed130a3ede0a46eb1b33972c7 scite141.tgz 637693
diff --git a/app-editors/scite/files/digest-scite-1.4.5 b/app-editors/scite/files/digest-scite-1.4.5
deleted file mode 100644
index e7eb2d972af5..000000000000
--- a/app-editors/scite/files/digest-scite-1.4.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fe8cda6beeec377586a9e72292daf179 scite145.tgz 658665
diff --git a/app-editors/scite/files/digest-scite-1.4.5-r1 b/app-editors/scite/files/digest-scite-1.4.5-r1
deleted file mode 100644
index d99b6d8c242a..000000000000
--- a/app-editors/scite/files/digest-scite-1.4.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fe8cda6beeec377586a9e72292daf179 scite145.tgz 658665
-MD5 ca3327560588f97314f04b4da6689e9c SciTEGTK.cxx.bz2 19641
diff --git a/app-editors/scite/files/digest-scite-1.5.4 b/app-editors/scite/files/digest-scite-1.5.4
new file mode 100644
index 000000000000..8b10cce4c6f5
--- /dev/null
+++ b/app-editors/scite/files/digest-scite-1.5.4
@@ -0,0 +1 @@
+MD5 5086acda2bb7a637fc34b0655e30930e scite154.tgz 840583
diff --git a/app-editors/scite/metadata.xml b/app-editors/scite/metadata.xml
new file mode 100644
index 000000000000..76b9f6f406d5
--- /dev/null
+++ b/app-editors/scite/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer><email>liquidx@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-editors/scite/scite-1.4.1.ebuild b/app-editors/scite/scite-1.4.1.ebuild
deleted file mode 100644
index 53c11247c6e9..000000000000
--- a/app-editors/scite/scite-1.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Taras Glek <taras.glek@home.com>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.4.1.ebuild,v 1.9 2003/02/13 06:58:47 vapier Exp $
-
-IUSE="gnome"
-
-S=${WORKDIR}/$PN/gtk
-MY_PV=141
-DESCRIPTION="A very powerful editor for programmers"
-SRC_URI="http://www.scintilla.org/${PN}${MY_PV}.tgz" 
-HOMEPAGE="http://www.scintilla.org"
-
-DEPEND="=x11-libs/gtk+-1.2*
-		gnome? ( gnome-base/gnome-core )"
-RDEPEND="=x11-libs/gtk+-1.2*"
-
-SLOT="0"
-LICENSE="PYTHON"
-KEYWORDS="x86 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
-	rm makefile
-	mv Makefile.good makefile
-	emake || die
-	
-}
-
-src_install () {
-
-	dodir /usr
-	dodir /usr/bin
-	dodir /usr/share
-	use gnome && dodir /usr/share/gnome/apps/Applications
-	make prefix=${D}/usr install || die
-	mv ${D}/usr/bin/SciTE ${D}/usr/bin/scite
-	
-}
-
diff --git a/app-editors/scite/scite-1.4.5-r1.ebuild b/app-editors/scite/scite-1.4.5-r1.ebuild
deleted file mode 100644
index da8fd06efdbd..000000000000
--- a/app-editors/scite/scite-1.4.5-r1.ebuild
+++ /dev/null
@@ -1,58 +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.4.5-r1.ebuild,v 1.7 2003/02/11 12:50:51 seemant Exp $
-
-IUSE="gnome"
-
-S=${WORKDIR}/$PN/gtk
-MY_PV=145
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org"
-SRC_URI="http://www.scintilla.org/${PN}${MY_PV}.tgz
-	mirror://gentoo/SciTEGTK.cxx.bz2
-	http://cvs.gentoo.org/~seemant/SciTEGTK.cxx.bz2"
-
-DEPEND="=x11-libs/gtk+-1.2*"
-
-SLOT="0"
-LICENSE="PYTHON"
-KEYWORDS="x86 ppc sparc"
-
-src_unpack() {
-	unpack ${A}
-	# yes could have created a diff... but it's dos-style crlf
-	cp ${WORKDIR}/SciTEGTK.cxx ${S}
-}
-
-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.4.5.ebuild b/app-editors/scite/scite-1.4.5.ebuild
deleted file mode 100644
index c7a80281f21a..000000000000
--- a/app-editors/scite/scite-1.4.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Taras Glek <taras.glek@home.com>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.4.5.ebuild,v 1.7 2003/02/13 06:58:53 vapier Exp $
-
-S=${WORKDIR}/$PN/gtk
-MY_PV=145
-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 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.4.ebuild
new file mode 100644
index 000000000000..aaf1cf597305
--- /dev/null
+++ b/app-editors/scite/scite-1.5.4.ebuild
@@ -0,0 +1,65 @@
+# 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.4.ebuild,v 1.1 2003/08/31 10:56:06 liquidx Exp $
+
+
+MY_PV=$(echo ${PV} | sed 's:\.::g')
+
+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* )
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/${PN}/gtk
+
+SLOT="0"
+LICENSE="PYTHON"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="gtk2 gnome"
+
+src_unpack() {
+	unpack ${A}
+	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}#" \
+		|| die "error patching makefile"
+
+	echo "Categories=Application;Development;" >> SciTE.desktop
+
+}
+
+src_compile() {
+	local makeopts
+	use gtk2 && makeopts="GTK2=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
+	
+	doman ../doc/scite.1
+	dodoc ../License.txt ../README
+
+}
+