Version bump to 3.3.1, remove old

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 7194459F)

3 files changed, 8 insertions, 89 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index c60427f6a27b..60d42c90186c 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.156 2013/04/17 10:36:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.157 2013/04/17 10:38:21 ago Exp $
+
+*scite-3.3.1 (17 Apr 2013)
+
+  17 Apr 2013; Agostino Sarubbo <ago@gentoo.org> +scite-3.3.1.ebuild,
+  -scite-3.2.3.ebuild, -scite-3.2.4.ebuild:
+  Version bump to 3.3.1, remove old
 
   17 Apr 2013; Agostino Sarubbo <ago@gentoo.org> scite-3.2.5.ebuild:
   Stable for x86, wrt bug #466214
diff --git a/app-editors/scite/scite-3.2.3.ebuild b/app-editors/scite/scite-3.2.3.ebuild
deleted file mode 100644
index 3c8300f7d378..000000000000
--- a/app-editors/scite/scite-3.2.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.2.3.ebuild,v 1.5 2013/02/21 21:52:08 ulm Exp $
-
-EAPI="4"
-
-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="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-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}
-	virtual/pkgconfig
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/${PN}/gtk"
-
-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"
-
-	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#^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}-3.0.1-no-lua.patch"
-}
-
-src_compile() {
-	emake -C ../../scintilla/gtk AR="$(tc-getAR)"
-	if use lua; then
-		emake
-	else
-		emake NO_LUA=1
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/{pixmaps,applications}
-
-	emake prefix="${ED}/usr" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	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"
-	domenu "${FILESDIR}/scite.desktop"
-
-	doman ../doc/scite.1
-	dodoc ../README
-}
diff --git a/app-editors/scite/scite-3.2.4.ebuild b/app-editors/scite/scite-3.3.1.ebuild
index 8a7049e336e7..a91c9ac28dcc 100644
--- a/app-editors/scite/scite-3.2.4.ebuild
+++ b/app-editors/scite/scite-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.2.4.ebuild,v 1.3 2013/02/22 20:57:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.3.1.ebuild,v 1.1 2013/04/17 10:38:21 ago Exp $
 
 EAPI="4"