Version bump to 3.0.1, update to EAPI 4, see bug #380061 and bug #392485.

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

4 files changed, 117 insertions, 8 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 3798d01f21c1..57a7115a504a 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,12 @@
 # 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.121 2011/08/13 15:55:04 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.122 2011/11/30 18:48:20 nelchael Exp $
+
+*scite-3.0.1 (30 Nov 2011)
+
+  30 Nov 2011; Krzysztof Pawlik <nelchael@gentoo.org> +scite-3.0.1.ebuild,
+  +files/scite-3.0.1-no-lua.patch:
+  Version bump to 3.0.1, update to EAPI 4, see bug #380061 and bug #392485.
 
 *scite-2.28 (13 Aug 2011)
 
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 9646581b2856..66db1ee27970 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,28 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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-3.0.1-no-lua.patch 632 RMD160 f894604d31f20c029c9412c4f881ec138eb4804c SHA1 27dfdcb481b2bb02b553d18acd523a251169d6df SHA256 30a228b95cfbdfd3c9dbe01e78a2ed887dbff92f7e3b04fbb254a5777cc66bfb
 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
+DIST scite301.tgz 1810301 RMD160 3f3c7614d7ac261520aa5721522584166977b7ca SHA1 175e616e9449ee94fa19d6ba38c0fe8963c20593 SHA256 603859e1ec1c05c1722d836b08180be36a70cc6662a6b574e83019b0da902e5d
 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
 EBUILD scite-2.28.ebuild 2119 RMD160 73441d17f34ec0b14be1eeef8f90280e25a19f03 SHA1 75c61da11b1a24f55d32edb6a1e2518e4989d1aa SHA256 839f8e0d19fd9e53c0ac99a60a146ba894f9dc3ba8d66133880e38bfd86c41f7
-MISC ChangeLog 17442 RMD160 386637cd96b11e1c986ce78d654c7ce2763f0b3b SHA1 d76f6d2b556e51eed7e99cd4ac5494db2c6c782f SHA256 f14bdd97e6f14c828cfda0d0cc738f026d4f5249a293fe55ad30616726adfeb2
+EBUILD scite-3.0.1.ebuild 1994 RMD160 aa054229489e98ba394104e6693621d35ec5fb04 SHA1 3ae3accd4de26b02591f550a8b7b36924994f258 SHA256 85e74d7921ef95bafd037abbe93848171970863ba3824bf06397f79be24b19cd
+MISC ChangeLog 17657 RMD160 907fd5e3da4ed649efffa1c78baf9e54805c6880 SHA1 10f3b22acbebd5532be02aaa168f6444f506c00b SHA256 800c68e05d6ac8bbfbb87027d5da401eb9b5b2b8b4902e6173a95b7e14681627
 MISC metadata.xml 209 RMD160 aad874f8991659f1214c1215c75597afc907d471 SHA1 9475be91874cb1e048ab26d4ea5ada17adcbc03f SHA256 ea9eb35c2edee74ca39c4e351322e86c12f3c37ce8a2bf1daa17ca5d07a578b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk58/F8ACgkQfXuS5UK5QB1vIgP+MsNw3rg8/zFGFDQftxNhtyN/
-BCFhX0p8GNj/9fMRuZhQ+XkQRQVXju1w85aOzKjeXgZk+JXt/E944L2sVq/xGxIH
-i7fDsMBpWsNcs+xAleh0AGc4mwbiu4f/P8CImcPkhUf0tUbEukOI6bgjjOwQKScl
-/fkrn/75yY7h7kx8Gcc=
-=1Olz
+iQEcBAEBCgAGBQJO1np6AAoJEBZyv1r2qA5GTlcIAI2TC41GZUUti1b8kybjGHSN
+BTUW/jH9V14goj26gnDAaRejbR//2Jd0FxqYRfqTJYHXR+IfZrwKBpgpEbTtoqbK
+ZAajpoD1+YC1aFp09A8D5sJxbgxUoglN77tJXAZDFxkQToeuAwiwf9+WUEg+YoRf
+ZcpntozFtSbcIHIOXlP8pjClIzbCua3Z4L/LIJYqUNxdj5p++OLY3kk+llvtYMgw
+IYCvpcr7Cz9CE7Th6jrjFK6ENeUVvKKHOg/9NK0PnwCttUmy/2fmagi5FJ+X1xLQ
+fcX0eeVGHP8eV/PbH7Yfku18Rdsynp/+LL0+xEDpdgAmA+Ppa4M4BlPsewFZ604=
+=rRMd
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/files/scite-3.0.1-no-lua.patch b/app-editors/scite/files/scite-3.0.1-no-lua.patch
new file mode 100644
index 000000000000..d63416a81eb7
--- /dev/null
+++ b/app-editors/scite/files/scite-3.0.1-no-lua.patch
@@ -0,0 +1,16 @@
+diff -Nru 3.0.1.vanilla/scite/src/SciTEProps.cxx 3.0.1/scite/src/SciTEProps.cxx
+--- 3.0.1.vanilla/scite/src/SciTEProps.cxx	2011-11-30 19:39:41.059801342 +0100
++++ 3.0.1/scite/src/SciTEProps.cxx	2011-11-30 19:39:53.211835004 +0100
+@@ -1702,10 +1702,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-3.0.1.ebuild b/app-editors/scite/scite-3.0.1.ebuild
new file mode 100644
index 000000000000..f4794d7bfbaa
--- /dev/null
+++ b/app-editors/scite/scite-3.0.1.ebuild
@@ -0,0 +1,82 @@
+# 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-3.0.1.ebuild,v 1.1 2011/11/30 18:48:20 nelchael 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"
+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_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#-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}-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="${D}/usr" install
+
+	# 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
+
+	# replace .desktop file with our own working version
+	rm -f "${D}/usr/share/applications/SciTE.desktop"
+	insinto /usr/share/applications
+	doins "${FILESDIR}/scite.desktop"
+
+	doman ../doc/scite.1
+	dodoc ../README
+}