Version bump.

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

5 files changed, 127 insertions, 5 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index c6d1e65358cb..1c51d69f4b26 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.85 2009/07/25 10:15:26 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.86 2009/08/02 23:27:22 nelchael Exp $
+
+*scite-1.79 (02 Aug 2009)
+
+  02 Aug 2009; Krzysiek Pawlik <nelchael@gentoo.org> +scite-1.79.ebuild,
+  +files/scite-1.79-install.patch, +files/scite-1.79-no-lua.patch:
+  Version bump.
 
   25 Jul 2009; Krzysiek Pawlik <nelchael@gentoo.org> -scite-1.76.ebuild,
   -files/scite-1.76-install.patch, -files/scite-1.76-no-lua.patch,
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 410f5f8bb6c0..1d934faacd4c 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -3,15 +3,19 @@ Hash: SHA1
 
 AUX scite-1.78-install.patch 796 RMD160 a83ffdf3e490015ccf1bd238c966a43d21e144db SHA1 7bd27b950293687a5ed0831dad23a790bbdd2ab9 SHA256 facc981015f07ad44433fc9df6d995e24da753afa89c4bbcaba62ba20e9812f6
 AUX scite-1.78-no-lua.patch 532 RMD160 333dce2ef1f121dcd59da05b9bf101e495c2a7ad SHA1 d2f2eb289591fd4f748de25e454ff5d4e8c74f1f SHA256 3214bd9468ca2adb550f8e135b88da3c42ed3b2c22519ea8590d32bd7055416e
+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.desktop 169 RMD160 760e2de111a56d037265b748ad65c621c1607c3b SHA1 edc81249bbe84ccf6b7a57f4a80381b58896badf SHA256 c0db119fed9a790efa073595099147ebd3c928d195ae908f6618e2f2ccdd0bcc
 DIST scite178.tgz 1568994 RMD160 72cce4382d912fe3c13d9e290470ff2c5443e1be SHA1 4eb7ea958ae3bf48ab9a872481ffbebd46d89ce1 SHA256 e7a99b2111e7156e9568737e31950879f250f8facba94012a6ac5351107022e9
+DIST scite179.tgz 1719588 RMD160 e36f0e394d1afea007840ea1bb4fc660b0a59f1b SHA1 43f343b75785b077b6a93b5be8f5fc7544a1a005 SHA256 ebd7105b892b68ec4f9190ffcd4a98226e84a73d2e9cbd29653d52692de3cbf9
 EBUILD scite-1.78.ebuild 1983 RMD160 5abe6b21fd1035207563ee7f282b0923b1483013 SHA1 b15081545eefd3ea1c82a99380b1bfb07a1e1818 SHA256 9adc3af24614f256648532b4b272b3e32bbaa63bae7879ea625e5275170de172
-MISC ChangeLog 12942 RMD160 4cee0920e03b3f44d39e924765ba740a11f6b5af SHA1 e751d27f79e6cdd9f12f02c5f59e13300b9ae450 SHA256 471570ba9621d3ed4988c908ce858e892424a860391d0fa8a796c60116c906c4
+EBUILD scite-1.79.ebuild 1987 RMD160 f57e21771a19853587a25faf8925137ed7977e61 SHA1 0e8aa2782fb0a6e8e6a64a9b7979f80383c78577 SHA256 ccef18df68e50b703d951173de6c1660192e0857c23b9ed5124d9b4c33c7e3f2
+MISC ChangeLog 13126 RMD160 6557b63ff67316170606c979b9b1cc293c5f9d0b SHA1 bea56a2549028124807820be37d7f34daba601c8 SHA256 4c62fcf9365abb6fab23afcc111aad0d5ae5e2c71399ba07bd03d59a9ae1084c
 MISC metadata.xml 304 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 SHA1 8523f14def71e343644655b7890f96e14864216c SHA256 a562714322c75636ca3a75c641035e41d6066319a292473fd1811fe7ac70d655
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpq20MACgkQgo/w9rxVVVGydACeIMpp9ya9FK+xTjJPX1xHu1h3
-D/oAoIu4MIg8PNxTFQWkdy3lY+9noaqU
-=CXM+
+iEYEARECAAYFAkp2IOYACgkQgo/w9rxVVVEbJwCbBXESi29Gviqd8IaEiEeIyrpD
+8eQAoJEtKNfu8o9AfyGAhLva5YZW/3DV
+=Ljnr
 -----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
new file mode 100644
index 000000000000..52f51e65b676
--- /dev/null
+++ b/app-editors/scite/files/scite-1.79-install.patch
@@ -0,0 +1,20 @@
+--- 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-1.79-no-lua.patch
new file mode 100644
index 000000000000..2511cef0faf9
--- /dev/null
+++ b/app-editors/scite/files/scite-1.79-no-lua.patch
@@ -0,0 +1,15 @@
+--- 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 @@
+ 
+ // 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-1.79.ebuild b/app-editors/scite/scite-1.79.ebuild
new file mode 100644
index 000000000000..29ec85d2c2ad
--- /dev/null
+++ b/app-editors/scite/scite-1.79.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.79.ebuild,v 1.1 2009/08/02 23:27:22 nelchael Exp $
+
+inherit toolchain-funcs eutils
+
+MY_PV=${PV//./}
+DESCRIPTION="A very powerful editor for programmers"
+HOMEPAGE="http://scintilla.sourceforge.net/SciTE.html"
+SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
+
+LICENSE="Scintilla"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~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 "${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}/${P}-install.patch"
+	epatch "${FILESDIR}/${P}-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
+}