Version bump, remove old versions.

(Portage version: 2.1.10.46/cvs/Linux x86_64)

9 files changed, 29 insertions, 403 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/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