From b8d5adea6f2d648adf2cb3b2742cce5b3501d664 Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Tue, 29 Jan 2013 21:11:51 +0000 Subject: Version bump to 3.2.4, remove old. (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit) --- app-editors/scite/ChangeLog | 8 +++- app-editors/scite/scite-3.1.0.ebuild | 87 ------------------------------------ app-editors/scite/scite-3.2.4.ebuild | 87 ++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 88 deletions(-) delete mode 100644 app-editors/scite/scite-3.1.0.ebuild create mode 100644 app-editors/scite/scite-3.2.4.ebuild (limited to 'app-editors/scite') diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog index ae1a1d9e06d0..46324128b39c 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.149 2013/01/02 12:14:52 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.150 2013/01/29 21:11:51 ago Exp $ + +*scite-3.2.4 (29 Jan 2013) + + 29 Jan 2013; Agostino Sarubbo +scite-3.2.4.ebuild, + -scite-3.1.0.ebuild: + Version bump to 3.2.4, remove old. 02 Jan 2013; Agostino Sarubbo scite-3.2.3.ebuild: Stable for amd64, wrt bug #449758 diff --git a/app-editors/scite/scite-3.1.0.ebuild b/app-editors/scite/scite-3.1.0.ebuild deleted file mode 100644 index 34bfa53f5e0b..000000000000 --- a/app-editors/scite/scite-3.1.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# 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-3.1.0.ebuild,v 1.7 2012/09/05 07:10:16 jlec 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="Scintilla" -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 - 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.2.4.ebuild new file mode 100644 index 000000000000..fe23a4b243fc --- /dev/null +++ b/app-editors/scite/scite-3.2.4.ebuild @@ -0,0 +1,87 @@ +# 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.1 2013/01/29 21:11:51 ago 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="Scintilla" +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 +} -- cgit v1.2.3-65-gdbad