Version bump, remove old versions.

Package-Manager: portage-2.1.10.46/cvs/Linux x86_64

10 files changed, 40 insertions, 421 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index afd53c386713..4ff9b492d926 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.130 2012/02/16 18:31:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.131 2012/02/16 18:46:31 nelchael Exp $
+
+*scite-3.0.3 (16 Feb 2012)
+
+  16 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  -files/scite-2.12-install.patch, -files/scite-2.12-no-lua.patch,
+  -scite-2.22.ebuild, -scite-2.25.ebuild, -scite-2.26.ebuild,
+  -scite-2.27.ebuild, -scite-2.28.ebuild, -files/scite-2.28-no-lua.patch,
+  +scite-3.0.3.ebuild:
+  Version bump, remove old versions.
 
   16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> scite-3.0.1.ebuild:
   x86 stable wrt bug #401097
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 4708b07c3b34..8dcbbe0e485e 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,31 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX scite-2.12-install.patch 664 RMD160 d44e1b0eec27a83920cb6218c3b9f887f02d9673 SHA1 23da4c0bcee4d7435db86bb8696441d95a9e857f SHA256 f9739808e1241f7ed3957ae10cb6dfcad623267142de52b75d8426ee0b0e65c4
-AUX scite-2.12-no-lua.patch 628 RMD160 114f97ae9f4a2c43591f75f2d877b054291eff85 SHA1 f6f947c015f3bde670d93cfdaea867806690573e SHA256 1e541670b13d67f0e8d5d906415c392178d86dc44dfb1c349d855cd7b75e6fc8
-AUX scite-2.28-no-lua.patch 644 RMD160 e6276104f5cbbe42e4d2100e588817872ff85eae SHA1 08532e121cb3b4a490ce9723644d06c3d848ade9 SHA256 a67dfe8252431e524fdc92a317fa1460bf2a3a9d6025964404158a7026a3de23
 AUX scite-3.0.1-no-lua.patch 632 RMD160 f894604d31f20c029c9412c4f881ec138eb4804c SHA1 27dfdcb481b2bb02b553d18acd523a251169d6df SHA256 30a228b95cfbdfd3c9dbe01e78a2ed887dbff92f7e3b04fbb254a5777cc66bfb
 AUX scite.desktop 169 RMD160 760e2de111a56d037265b748ad65c621c1607c3b SHA1 edc81249bbe84ccf6b7a57f4a80381b58896badf SHA256 c0db119fed9a790efa073595099147ebd3c928d195ae908f6618e2f2ccdd0bcc
-DIST scite222.tgz 1816710 RMD160 812b1be76aa2eb24ec5e67a2da64f4cedf450673 SHA1 09b1fc2f693c1934f90287671ba5f0e9b4258620 SHA256 95b904318414c5910a1e1c8c0c631b761563db83cc75cd5a9244da156b592a8e
-DIST scite225.tgz 1843570 RMD160 3b86042411f2272fa87428883386e5a7e5d86653 SHA1 6b33f254cc4760fdd861223573524e270b735a0b SHA256 e9f1c7d5909fca359cb2993eb82a07b3323d53bcd0d4ba1e8ff181a8d471061f
-DIST scite226.tgz 1882394 RMD160 e55abe75f34234899738cab0d1da03aea2ca267c SHA1 ebb4e4cc1d663f97bfd31dd3554764bb108e2cff SHA256 41587ed05295f72600967e3b8668f47a8d529d6e4e8be5980070ebfd13ef83f3
-DIST scite227.tgz 1883989 RMD160 f61251b8d451ef05bedef55836b483bbf188c761 SHA1 d248394fe09dc1d111d1afe5c89320b67c01e9f0 SHA256 9bf6e3515022cc12a3b24b158f54ae1a4730f104b65a6fcdb997f4f7a84b2c0c
-DIST scite228.tgz 1875473 RMD160 8497fb7b65bc203c94b6d557955b58e14186cfff SHA1 38d75df0997cf68215cac0ea79ad68243741b200 SHA256 a4fa35a2babdfdc25d41474ea8133e6f1fbffaf411ebfc260740e728505acaf7
 DIST scite301.tgz 1810301 RMD160 3f3c7614d7ac261520aa5721522584166977b7ca SHA1 175e616e9449ee94fa19d6ba38c0fe8963c20593 SHA256 603859e1ec1c05c1722d836b08180be36a70cc6662a6b574e83019b0da902e5d
 DIST scite302.tgz 1825937 RMD160 58deba8cc61299ce3e827dc01dde12a39f394789 SHA1 c614e10ff3e2b0af85fb9f7833592c4e7c82730b SHA256 a5687faaa201c39a4ec9608e8a77e418e259f525b21871a5c9f1282c62e58eaa
-EBUILD scite-2.22.ebuild 2113 RMD160 c5503d24be8098f5fcd1cbefa2e2a9a5bb71fa71 SHA1 f4c694f97cf8e540b426a922bd86897bb85504e5 SHA256 90f71792a2646f3461b5ffcf27f7af24cae75dcedd8ed32358c47f440fdf010b
-EBUILD scite-2.25.ebuild 2115 RMD160 c7b8f0e30ae65ce5aaab25eda2ee2028f6277ae4 SHA1 dcb0778477363eb373f90f7fcaaaa76488a02663 SHA256 93c42ccc2668a520d35a76a0ced7f0918344f23270d7d07d31215c346e9f836a
-EBUILD scite-2.26.ebuild 2165 RMD160 2f8eb1fad5bdfc5961b932f41dd93fd12950d3f1 SHA1 d9a0262990261f40e8a27cfb9cdc02e6b945e3f5 SHA256 3c1c23d95924a3a3771f076e85d8cfeae6977ceaab21e78811f5775d0e7dd034
-EBUILD scite-2.27.ebuild 2166 RMD160 c5411b60f0364b263a8c6734d33d3e80fabd0beb SHA1 5cb7eb855892b896e991c94b2d0564b9483e8cca SHA256 f7c92601930ec5b6239f4dd46bfe939cfcf48d51ac5617c5a7c9ed801df56d43
-EBUILD scite-2.28.ebuild 2187 RMD160 1c24a960eb11944a8ec5fb55903e046864a63189 SHA1 52189d52206acd9c6b15830f2bd69f3b7835a459 SHA256 89f96ff2b74b729c3882d3b7cd99e91fc0c75bd127278fe8979ef35bab6bf216
+DIST scite303.tgz 1906430 RMD160 8b29fbe2da0cbb737a6d2783db5aa1953cd53aaa SHA1 c1ddd6d3744dcffe20d1784ebb86ad2f16d43515 SHA256 0d02b81f6f182366abe8133f4e727d802b756d33e9eeba5fe9ac69c4a17286fd
 EBUILD scite-3.0.1.ebuild 2159 RMD160 480d75df84bc8a89555619316cd5a17a8d19bbe0 SHA1 2cd20a5e50a2940479a3cab32b44471ff004df4e SHA256 bb30089ce0f590464943adf1b41b62c60e4ca72c8187790471a55ce1d8b7905c
 EBUILD scite-3.0.2.ebuild 2160 RMD160 4aa229c7f99fba2f6e166d75bf12574b1245ffcb SHA1 508684e9060645101a7b83318ce9064f3b7ee311 SHA256 d7ae5d4a5d7225bd9895d3264c51983fb13b15355db5d7397a3226bfee070a9c
-MISC ChangeLog 18665 RMD160 6b4c225ba4b3a2d73f6fc04b8b4e2eb532d1197c SHA1 57bc73503916b031bff10e183bcca99574b6bfac SHA256 50976486395eebf74c1c24c0b47b9e62681bb7ea3d9c5f433286a956b4633631
+EBUILD scite-3.0.3.ebuild 2160 RMD160 5a3218058db65220d8407510038fcb01ec05e975 SHA1 a4f4306153087764831bc3bd14bd2371dfd0e50b SHA256 63dd5f9779ac668b3154f379545d536f83944d0dcb8dbc37dc5d7fb5ea40c7f9
+MISC ChangeLog 19009 RMD160 7142be14d845e5b6be0713a5362feaf640c11d1b SHA1 bfd22edeb57d1de0c63109bedf8861cacc4fd3cc SHA256 eafd3c8c04aa0d961def6611eb680d226ce5a8729b463c00db535676ce03b415
 MISC metadata.xml 209 RMD160 aad874f8991659f1214c1215c75597afc907d471 SHA1 9475be91874cb1e048ab26d4ea5ada17adcbc03f SHA256 ea9eb35c2edee74ca39c4e351322e86c12f3c37ce8a2bf1daa17ca5d07a578b7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk89S4MACgkQuUQtlDBCeQKwRACdHV7Xbiaj8SqflM/TMhhVtM7c
-tggAn0/obaxSrckHIN8b6BG5RBjgqcfV
-=uHWE
+iQEcBAEBCgAGBQJPPU8UAAoJEBZyv1r2qA5GR68H/0Q3jsKWtuj4uM74cD1d/Pf5
+MZ1BCf3eCYp1Ce8slUFeADHaq/FlVGNDg5vkTAku0Zk6osXPsl7FhIaMBgrhxTwT
+sf+2QOMWlI259bU0cC1rTO3atu4qGqoze3cG5c2oRK9oThPiyntPYf1ZMo98wwgV
+Qwo2iYUgrz0R2lT296PWbWrTHiWkUC1+fiXBQK9WBzMCbJY67QWzlFk+4DN1Puh5
+AMAv6Q8GNYKiJnkjYrxYia4QQY5h9Pkfs2uFLVsenmYRw7ZIe5c9zamSjY6f9q7M
+kJDbmNZXWpJYagL7bqI4Wa3PYff4iDjWFpiTte4P+trwJPpIAyCBf53sNw2aDNQ=
+=dB5a
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/files/scite-2.12-install.patch b/app-editors/scite/files/scite-2.12-install.patch
deleted file mode 100644
index ccce6fe145f1..000000000000
--- a/app-editors/scite/files/scite-2.12-install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nru vanilla//scite/gtk/makefile patched//scite/gtk/makefile
---- vanilla//scite/gtk/makefile	2010-06-23 18:04:42.631333431 +0100
-+++ patched//scite/gtk/makefile	2010-06-23 18:06:11.150336242 +0100
-@@ -107,8 +107,10 @@
- 	done
- 
- ifdef gnomeprefix
--	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
--	$(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications/
-+	$(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(pixmapdir)/
-+	$(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
- endif
- 
- uninstall:
diff --git a/app-editors/scite/files/scite-2.12-no-lua.patch b/app-editors/scite/files/scite-2.12-no-lua.patch
deleted file mode 100644
index 106c2453aa44..000000000000
--- a/app-editors/scite/files/scite-2.12-no-lua.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nru vanilla//scite/src/SciTEProps.cxx patched//scite/src/SciTEProps.cxx
---- vanilla//scite/src/SciTEProps.cxx	2010-06-23 18:04:42.639336085 +0100
-+++ patched//scite/src/SciTEProps.cxx	2010-06-23 18:07:00.606351119 +0100
-@@ -1532,10 +1532,12 @@
- 
- // return the int value of the command name passed in.
- int SciTEBase::GetMenuCommandAsInt(SString commandName) {
-+#ifndef NO_LUA
- 	int i = IFaceTable::FindConstant(commandName.c_str());
- 	if (i != -1) {
- 		return IFaceTable::constants[i].value;
- 	}
-+#endif
- 	// Otherwise we might have entered a number as command to access a "SCI_" command
- 	return commandName.value();
- }
diff --git a/app-editors/scite/files/scite-2.28-no-lua.patch b/app-editors/scite/files/scite-2.28-no-lua.patch
deleted file mode 100644
index 884d509d67f4..000000000000
--- a/app-editors/scite/files/scite-2.28-no-lua.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nru scite228.vanilla/scite/src/SciTEProps.cxx scite228/scite/src/SciTEProps.cxx
---- scite228.vanilla/scite/src/SciTEProps.cxx	2011-08-01 04:49:30.000000000 +0200
-+++ scite228/scite/src/SciTEProps.cxx	2011-08-13 17:43:39.380238668 +0200
-@@ -1651,10 +1651,12 @@
- 
- // return the int value of the command name passed in.
- int SciTEBase::GetMenuCommandAsInt(SString commandName) {
-+#ifndef NO_LUA
- 	int i = IFaceTable::FindConstant(commandName.c_str());
- 	if (i != -1) {
- 		return IFaceTable::constants[i].value;
- 	}
-+#endif
- 	// Otherwise we might have entered a number as command to access a "SCI_" command
- 	return commandName.value();
- }
diff --git a/app-editors/scite/scite-2.22.ebuild b/app-editors/scite/scite-2.22.ebuild
deleted file mode 100644
index c2e75879b9f8..000000000000
--- a/app-editors/scite/scite-2.22.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-2.22.ebuild,v 1.7 2011/06/25 17:18:53 armin76 Exp $
-
-EAPI="1"
-
-inherit toolchain-funcs eutils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org/SciTE.html"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="Scintilla"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="lua"
-
-RDEPEND="x11-libs/gtk+:2
-	lua? ( >=dev-lang/lua-5 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=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)#" \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-
-	cd "${WORKDIR}/scite/gtk"
-	sed -i makefile \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		|| 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}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-2.12-install.patch"
-	epatch "${FILESDIR}/${PN}-2.12-no-lua.patch"
-}
-
-src_compile() {
-	make -C ../../scintilla/gtk || die "prep make failed"
-	if use lua; then
-		emake || die "make failed"
-	else
-		emake NO_LUA=1 || die "make failed"
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/{pixmaps,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-2.26.ebuild b/app-editors/scite/scite-2.26.ebuild
deleted file mode 100644
index 89a904862566..000000000000
--- a/app-editors/scite/scite-2.26.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-2.26.ebuild,v 1.2 2011/06/25 17:18:53 armin76 Exp $
-
-EAPI="1"
-
-inherit toolchain-funcs eutils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org/SciTE.html"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="Scintilla"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="lua"
-
-RDEPEND="x11-libs/gtk+:2
-	lua? ( >=dev-lang/lua-5 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=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)#" \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-
-	cd "${WORKDIR}/scite/gtk"
-	sed -i makefile \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		|| 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}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-2.12-install.patch"
-	epatch "${FILESDIR}/${PN}-2.12-no-lua.patch"
-}
-
-src_compile() {
-	make -C ../../scintilla/gtk || die "prep make failed"
-	if use lua; then
-		emake || die "make failed"
-	else
-		emake NO_LUA=1 || die "make failed"
-	fi
-}
-
-src_install() {
-	dodir /usr/bin || die
-	dodir /usr/share/{pixmaps,applications} || die
-
-	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" || die
-	dosym /usr/bin/scite /usr/bin/SciTE || die
-
-	# replace .desktop file with our own working version
-	rm -f "${D}/usr/share/applications/SciTE.desktop"
-	insinto /usr/share/applications
-	doins "${FILESDIR}/scite.desktop" || die
-
-	doman ../doc/scite.1 || die
-	dodoc ../README || die
-}
diff --git a/app-editors/scite/scite-2.27.ebuild b/app-editors/scite/scite-2.27.ebuild
deleted file mode 100644
index a18275b44cc8..000000000000
--- a/app-editors/scite/scite-2.27.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-2.27.ebuild,v 1.3 2011/08/07 03:16:29 phajdan.jr Exp $
-
-EAPI="1"
-
-inherit toolchain-funcs eutils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org/SciTE.html"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="Scintilla"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="lua"
-
-RDEPEND="x11-libs/gtk+:2
-	lua? ( >=dev-lang/lua-5 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=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)#" \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-
-	cd "${WORKDIR}/scite/gtk"
-	sed -i makefile \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		|| 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}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-2.12-install.patch"
-	epatch "${FILESDIR}/${PN}-2.12-no-lua.patch"
-}
-
-src_compile() {
-	make -C ../../scintilla/gtk || die "prep make failed"
-	if use lua; then
-		emake || die "make failed"
-	else
-		emake NO_LUA=1 || die "make failed"
-	fi
-}
-
-src_install() {
-	dodir /usr/bin || die
-	dodir /usr/share/{pixmaps,applications} || die
-
-	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" || die
-	dosym /usr/bin/scite /usr/bin/SciTE || die
-
-	# replace .desktop file with our own working version
-	rm -f "${D}/usr/share/applications/SciTE.desktop"
-	insinto /usr/share/applications
-	doins "${FILESDIR}/scite.desktop" || die
-
-	doman ../doc/scite.1 || die
-	dodoc ../README || die
-}
diff --git a/app-editors/scite/scite-2.28.ebuild b/app-editors/scite/scite-2.28.ebuild
deleted file mode 100644
index 0ce3fdb86eef..000000000000
--- a/app-editors/scite/scite-2.28.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-2.28.ebuild,v 1.3 2011/12/07 07:29:48 phajdan.jr Exp $
-
-EAPI="1"
-
-inherit toolchain-funcs eutils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org/SciTE.html"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="Scintilla"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="lua"
-
-RDEPEND="dev-libs/glib
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=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)#" \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-
-	cd "${WORKDIR}/scite/gtk"
-	sed -i makefile \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		|| 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}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-2.28-no-lua.patch"
-}
-
-src_compile() {
-	make -C ../../scintilla/gtk || die "prep make failed"
-	if use lua; then
-		emake || die "make failed"
-	else
-		emake NO_LUA=1 || die "make failed"
-	fi
-}
-
-src_install() {
-	dodir /usr/bin || die
-	dodir /usr/share/{pixmaps,applications} || die
-
-	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" || die
-	dosym /usr/bin/scite /usr/bin/SciTE || die
-
-	# replace .desktop file with our own working version
-	rm -f "${D}/usr/share/applications/SciTE.desktop"
-	insinto /usr/share/applications
-	doins "${FILESDIR}/scite.desktop" || die
-
-	doman ../doc/scite.1 || die
-	dodoc ../README || die
-}
diff --git a/app-editors/scite/scite-2.25.ebuild b/app-editors/scite/scite-3.0.3.ebuild
index de9cfe78b7ee..e9da31ce2d5f 100644
--- a/app-editors/scite/scite-2.25.ebuild
+++ b/app-editors/scite/scite-3.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-2.25.ebuild,v 1.4 2011/07/02 15:12:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.0.3.ebuild,v 1.1 2012/02/16 18:46:31 nelchael Exp $
 
-EAPI="1"
+EAPI="4"
 
 inherit toolchain-funcs eutils
 
@@ -13,10 +13,14 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
 LICENSE="Scintilla"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="lua"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
 	lua? ( >=dev-lang/lua-5 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -24,13 +28,13 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}/gtk"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	cd "${WORKDIR}/scintilla/gtk"
 	sed -i makefile \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
 		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
 		-e "s#-Os##" \
 		|| die "error patching makefile"
 
@@ -46,21 +50,21 @@ src_unpack() {
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
 		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
 		-e 's#${D}##' \
 		-e 's#-g root#-g 0#' \
 		-e "s#-Os##" \
 		|| die "error patching makefile"
 	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-2.12-install.patch"
-	epatch "${FILESDIR}/${PN}-2.12-no-lua.patch"
+	epatch "${FILESDIR}/${PN}-3.0.1-no-lua.patch"
 }
 
 src_compile() {
-	make -C ../../scintilla/gtk || die "prep make failed"
+	emake -C ../../scintilla/gtk
 	if use lua; then
-		emake || die "make failed"
+		emake
 	else
-		emake NO_LUA=1 || die "make failed"
+		emake NO_LUA=1
 	fi
 }
 
@@ -68,15 +72,15 @@ src_install() {
 	dodir /usr/bin
 	dodir /usr/share/{pixmaps,applications}
 
-	make prefix="${D}/usr" install || die
+	emake prefix="${ED}/usr" install
 
 	# we have to keep this because otherwise it'll break upgrading
-	mv "${D}/usr/bin/SciTE" "${D}/usr/bin/scite"
+	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
 	dosym /usr/bin/scite /usr/bin/SciTE
 
 	# replace .desktop file with our own working version
+	rm -f "${ED}/usr/share/applications/SciTE.desktop"
 	insinto /usr/share/applications
-	rm -f "${D}/usr/share/applications/SciTE.desktop"
 	doins "${FILESDIR}/scite.desktop"
 
 	doman ../doc/scite.1