Version bump, remove old files.

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

5 files changed, 107 insertions, 31 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 6bff14bce9f9..3798d01f21c1 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.120 2011/08/07 03:16:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.121 2011/08/13 15:55:04 nelchael Exp $
+
+*scite-2.28 (13 Aug 2011)
+
+  13 Aug 2011; Krzysztof Pawlik <nelchael@gentoo.org>
+  -files/scite-1.79-install.patch, -files/scite-1.79-no-lua.patch,
+  +scite-2.28.ebuild, +files/scite-2.28-no-lua.patch:
+  Version bump, remove old files.
 
   07 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> scite-2.27.ebuild:
   x86 stable wrt bug #377087
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index c79e5eff61f7..0f157f591206 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,25 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX scite-1.79-install.patch 796 RMD160 a83ffdf3e490015ccf1bd238c966a43d21e144db SHA1 7bd27b950293687a5ed0831dad23a790bbdd2ab9 SHA256 facc981015f07ad44433fc9df6d995e24da753afa89c4bbcaba62ba20e9812f6
-AUX scite-1.79-no-lua.patch 532 RMD160 333dce2ef1f121dcd59da05b9bf101e495c2a7ad SHA1 d2f2eb289591fd4f748de25e454ff5d4e8c74f1f SHA256 3214bd9468ca2adb550f8e135b88da3c42ed3b2c22519ea8590d32bd7055416e
 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.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
 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
-MISC ChangeLog 17207 RMD160 75fb8859fc96c68aef7349d25501aba29dbe7e0f SHA1 f4a9b06484d8115e0e8575ea36628b87b8271a15 SHA256 a915dd4c34de84ff427922f8996c251eb73fa38d8a4781cc615ebc563780a6f8
+EBUILD scite-2.28.ebuild 2119 RMD160 73441d17f34ec0b14be1eeef8f90280e25a19f03 SHA1 75c61da11b1a24f55d32edb6a1e2518e4989d1aa SHA256 839f8e0d19fd9e53c0ac99a60a146ba894f9dc3ba8d66133880e38bfd86c41f7
+MISC ChangeLog 17442 RMD160 386637cd96b11e1c986ce78d654c7ce2763f0b3b SHA1 d76f6d2b556e51eed7e99cd4ac5494db2c6c782f SHA256 f14bdd97e6f14c828cfda0d0cc738f026d4f5249a293fe55ad30616726adfeb2
 MISC metadata.xml 232 RMD160 926bb745121f8d086030c0f49c00fbd229920091 SHA1 82254e1f7bf12fa681f9b296769562fd780caca4 SHA256 74bb6bad73600f14617c1cfcbaaf676a4104fb2db103c83bbdb9a07844b1c5bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk4+A5MACgkQuUQtlDBCeQKvPgCeK+brBkDda6srBjjTRrLjrLFW
-h64An1dFZfjlsaz0w6CG3oqNqDSFuuYe
-=Vrid
+iQEcBAEBCgAGBQJORp5eAAoJEBZyv1r2qA5GEvsIAJLzqdNV9oL5vu2QKzjbNVcC
+wpdtvI79cG6fMK7FtvAz2qOnGoXGRRSIukHnJzBnsUvTnD8mTsDM18Pdea54d2UP
+d8OSNdpYW3kzbsZramHReIJgv5Pudz2x56FLuJffTkhI7f42RsSySN2aGn+ULGDJ
+XENyHj4gIAfg1h8thkVxUrW0oYdbOm80eIaUJ3j4365qU1wBrV2obJ2AGWU9KVU+
+o6bb0h7x/bc9NwjZc7K8wDbPCcn+nJmG2jOwfLjPww11bXM/zJjEVm/0wtYuyB3+
+UUbn3QyV3dXv0DmMweIJGGBbNsrUHdyxwjKndZ2D+vs6ZlD80vs3/9X8G9LHl8c=
+=V7RW
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/files/scite-1.79-install.patch b/app-editors/scite/files/scite-1.79-install.patch
deleted file mode 100644
index 52f51e65b676..000000000000
--- a/app-editors/scite/files/scite-1.79-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- scite/gtk/makefile.orig	2006-10-09 06:26:55 -0300
-+++ scite/gtk/makefile	2006-10-09 06:36:09 -0300
-@@ -123,11 +123,14 @@
- 
- ifdef gnomeprefix
- ifdef GTK2
--	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications/
-+	$(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/
- else
--	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications/
-+	$(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/
- endif
--	$(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
-+	$(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-1.79-no-lua.patch b/app-editors/scite/files/scite-2.28-no-lua.patch
index 2511cef0faf9..884d509d67f4 100644
--- a/app-editors/scite/files/scite-1.79-no-lua.patch
+++ b/app-editors/scite/files/scite-2.28-no-lua.patch
@@ -1,6 +1,7 @@
---- scite/src/SciTEProps.cxx	2008-04-05 17:23:22.000000000 +0200
-+++ scite/src/SciTEProps.cxx	2008-04-05 17:23:41.000000000 +0200
-@@ -1461,10 +1461,12 @@
+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) {
diff --git a/app-editors/scite/scite-2.28.ebuild b/app-editors/scite/scite-2.28.ebuild
new file mode 100644
index 000000000000..fd6855e8d3c8
--- /dev/null
+++ b/app-editors/scite/scite-2.28.ebuild
@@ -0,0 +1,83 @@
+# 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.1 2011/08/13 15:55:04 nelchael 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.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
+}