Version bump.

Package-Manager: portage-2.1.5_rc1

5 files changed, 134 insertions, 3 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 5c4d31d1c37f..0585e696b8e8 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/scite
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.68 2007/11/10 10:53:23 nelchael Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.69 2008/04/05 15:29:54 nelchael Exp $
+
+*scite-1.76 (05 Apr 2008)
+
+  05 Apr 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/scite-1.76-install.patch, +files/scite-1.76-no-lua.patch,
+  +scite-1.76.ebuild:
+  Version bump.
 
   10 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   -files/scite-1.73-install.patch, -scite-1.73.ebuild, scite-1.74.ebuild:
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index b49799c00df1..aaf90de7a1ef 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scite-1.72-install.patch 796 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b SHA1 4867e253ae7831fdae2e0425441fee24c176d694 SHA256 c8e2a3ea36c43ffb9c3f8f7175f79f8a2e3f1eccef4323ba22571d198ebe2294
 AUX scite-1.74-install.patch 796 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b SHA1 4867e253ae7831fdae2e0425441fee24c176d694 SHA256 c8e2a3ea36c43ffb9c3f8f7175f79f8a2e3f1eccef4323ba22571d198ebe2294
+AUX scite-1.76-install.patch 796 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b SHA1 4867e253ae7831fdae2e0425441fee24c176d694 SHA256 c8e2a3ea36c43ffb9c3f8f7175f79f8a2e3f1eccef4323ba22571d198ebe2294
+AUX scite-1.76-no-lua.patch 532 RMD160 333dce2ef1f121dcd59da05b9bf101e495c2a7ad SHA1 d2f2eb289591fd4f748de25e454ff5d4e8c74f1f SHA256 3214bd9468ca2adb550f8e135b88da3c42ed3b2c22519ea8590d32bd7055416e
 AUX scite.desktop 169 RMD160 760e2de111a56d037265b748ad65c621c1607c3b SHA1 edc81249bbe84ccf6b7a57f4a80381b58896badf SHA256 c0db119fed9a790efa073595099147ebd3c928d195ae908f6618e2f2ccdd0bcc
 DIST scite172.tgz 1335014 RMD160 7ffcfa07f43560122692bc4bd00bc910167e9082 SHA1 5cb13215db44a7f37c4625fada8ca7f5e2dfbe96 SHA256 336c9b93f731882c9c5b95eadbe2751097347113e1d729c49b3e5f85ca4ad42e
 DIST scite174.tgz 1460459 RMD160 a4547865bf2884108fbfbc8eaae1c7d1200ddd47 SHA1 64066ed557c15821a50955b86acdda0d32e0a472 SHA256 10640a1c4bde4b1f5726085c95f7a139a044853911ebeaffa58f42aa26359e01
+DIST scite176.tgz 1497197 RMD160 3e82bb6c425aaeaa9dd932e179e837e1fcce9d71 SHA1 46ef6c7d5f312ed68cac8431eab17efa0e618d5e SHA256 cea1f932cea33e93f018ac6929f1d18edd6cfe8fdcac73b05da4e721987285a0
 EBUILD scite-1.72.ebuild 1862 RMD160 ec5457be0aded4d43982f6d1bcc8cff8d66add13 SHA1 b2b1ca18797195cf6ad0e4216238ada64c0a6005 SHA256 4fecc63808b6ba8255de1a7e8ac356bf2bcdf0aabf31f2c8b5fbb1f95f5fd47c
 EBUILD scite-1.74.ebuild 1886 RMD160 19b24324e50c72c84a51452106a6193fb3ed16e6 SHA1 3522bd31bd789ad5f1cc33aff00082314801b29e SHA256 6f4c505888bcd337cf0b99d22893f4ac17b44514bec21e396f8528e8b8bf1dc0
-MISC ChangeLog 10674 RMD160 3b1312c97eae499193306c381e1c239da8d629cf SHA1 f8933aa20467e7af00220041fb6c4b8bb3211132 SHA256 50303721292a9dd7129be57d164aeb1e89a9c61f42ead0614ba47d067f01cac2
+EBUILD scite-1.76.ebuild 1943 RMD160 41b0e9458e7fdb9c2fb0556b7e4c37ff041db8d2 SHA1 0c8d4203d5d841b85d12fd1f10119cf2792ab893 SHA256 2a32e99699941d21363c84a58c57b66dbd88ba61a39a85212085a72db4333149
+MISC ChangeLog 10860 RMD160 55dbcd28f95e9adf1626c5de8ada1f811a419e48 SHA1 3d3025a0ccdcd6426419ac64e811414676cbc12f SHA256 dbcaef5fd92df06274e6106bdae046b4adf4077c3b686f588c9fe1a67a5b6ad3
 MISC metadata.xml 304 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 SHA1 8523f14def71e343644655b7890f96e14864216c SHA256 a562714322c75636ca3a75c641035e41d6066319a292473fd1811fe7ac70d655
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkf3mvcACgkQgo/w9rxVVVH8eACgsP3EMH15VUZpZI3hR6gE70ls
+VxgAn2W3z2BhnSIvPpJnzepp27pnESxJ
+=pLdM
+-----END PGP SIGNATURE-----
diff --git a/app-editors/scite/files/scite-1.76-install.patch b/app-editors/scite/files/scite-1.76-install.patch
new file mode 100644
index 000000000000..c1d87501c855
--- /dev/null
+++ b/app-editors/scite/files/scite-1.76-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 644 -d $(DESTDIR)$(pixmapdir)/
++	$(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ endif
+ 
+ uninstall:
diff --git a/app-editors/scite/files/scite-1.76-no-lua.patch b/app-editors/scite/files/scite-1.76-no-lua.patch
new file mode 100644
index 000000000000..2511cef0faf9
--- /dev/null
+++ b/app-editors/scite/files/scite-1.76-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.76.ebuild b/app-editors/scite/scite-1.76.ebuild
new file mode 100644
index 000000000000..96c85984e887
--- /dev/null
+++ b/app-editors/scite/scite-1.76.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.76.ebuild,v 1.1 2008/04/05 15:29:54 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"
+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)#" \
+		|| 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#' \
+		|| 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
+}