Version BUmp, #407539

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 100 insertions, 9 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 4ff9b492d926..2c83215892d8 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.131 2012/02/16 18:46:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.132 2012/03/10 08:48:21 jlec Exp $
+
+*scite-3.0.4 (10 Mar 2012)
+
+  10 Mar 2012; Justin Lecher <jlec@gentoo.org> +scite-3.0.4.ebuild:
+  Version BUmp, #407539
 
 *scite-3.0.3 (16 Feb 2012)
 
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 8dcbbe0e485e..974d01f42fe9 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -6,19 +6,17 @@ AUX scite.desktop 169 RMD160 760e2de111a56d037265b748ad65c621c1607c3b SHA1 edc81
 DIST scite301.tgz 1810301 RMD160 3f3c7614d7ac261520aa5721522584166977b7ca SHA1 175e616e9449ee94fa19d6ba38c0fe8963c20593 SHA256 603859e1ec1c05c1722d836b08180be36a70cc6662a6b574e83019b0da902e5d
 DIST scite302.tgz 1825937 RMD160 58deba8cc61299ce3e827dc01dde12a39f394789 SHA1 c614e10ff3e2b0af85fb9f7833592c4e7c82730b SHA256 a5687faaa201c39a4ec9608e8a77e418e259f525b21871a5c9f1282c62e58eaa
 DIST scite303.tgz 1906430 RMD160 8b29fbe2da0cbb737a6d2783db5aa1953cd53aaa SHA1 c1ddd6d3744dcffe20d1784ebb86ad2f16d43515 SHA256 0d02b81f6f182366abe8133f4e727d802b756d33e9eeba5fe9ac69c4a17286fd
+DIST scite304.tgz 1927166 RMD160 7b5871cf28feb396b4ed59e3f88f1600bea3a1e2 SHA1 b7328d649678d998619a27d59f74ba3cd83f9a80 SHA256 2cdd67520d248716496240a629aa5cd56760b52d327ee18d53640e77e02af481
 EBUILD scite-3.0.1.ebuild 2159 RMD160 480d75df84bc8a89555619316cd5a17a8d19bbe0 SHA1 2cd20a5e50a2940479a3cab32b44471ff004df4e SHA256 bb30089ce0f590464943adf1b41b62c60e4ca72c8187790471a55ce1d8b7905c
 EBUILD scite-3.0.2.ebuild 2160 RMD160 4aa229c7f99fba2f6e166d75bf12574b1245ffcb SHA1 508684e9060645101a7b83318ce9064f3b7ee311 SHA256 d7ae5d4a5d7225bd9895d3264c51983fb13b15355db5d7397a3226bfee070a9c
 EBUILD scite-3.0.3.ebuild 2160 RMD160 5a3218058db65220d8407510038fcb01ec05e975 SHA1 a4f4306153087764831bc3bd14bd2371dfd0e50b SHA256 63dd5f9779ac668b3154f379545d536f83944d0dcb8dbc37dc5d7fb5ea40c7f9
-MISC ChangeLog 19009 RMD160 7142be14d845e5b6be0713a5362feaf640c11d1b SHA1 bfd22edeb57d1de0c63109bedf8861cacc4fd3cc SHA256 eafd3c8c04aa0d961def6611eb680d226ce5a8729b463c00db535676ce03b415
+EBUILD scite-3.0.4.ebuild 2156 RMD160 bcb6a8e396bca74d5ed09560a09817c30b63e91a SHA1 181d7761b27ab92e84315d75d8540b9ee96e352b SHA256 624825f6f3c9584e45ce484cc7b64d4d9ad4944565037242c1fbbd40bf93936c
+MISC ChangeLog 19126 RMD160 e760d0aa05347c26c2c247a029bf1d99a9252e9f SHA1 b043f1fba8e5a3f290ca7881fb50707c64c463b0 SHA256 cc3b712d412799c2fbcc877ceb71af04ee36e5addba7fc0870e9d69045cadbe5
 MISC metadata.xml 209 RMD160 aad874f8991659f1214c1215c75597afc907d471 SHA1 9475be91874cb1e048ab26d4ea5ada17adcbc03f SHA256 ea9eb35c2edee74ca39c4e351322e86c12f3c37ce8a2bf1daa17ca5d07a578b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPPU8UAAoJEBZyv1r2qA5GR68H/0Q3jsKWtuj4uM74cD1d/Pf5
-MZ1BCf3eCYp1Ce8slUFeADHaq/FlVGNDg5vkTAku0Zk6osXPsl7FhIaMBgrhxTwT
-sf+2QOMWlI259bU0cC1rTO3atu4qGqoze3cG5c2oRK9oThPiyntPYf1ZMo98wwgV
-Qwo2iYUgrz0R2lT296PWbWrTHiWkUC1+fiXBQK9WBzMCbJY67QWzlFk+4DN1Puh5
-AMAv6Q8GNYKiJnkjYrxYia4QQY5h9Pkfs2uFLVsenmYRw7ZIe5c9zamSjY6f9q7M
-kJDbmNZXWpJYagL7bqI4Wa3PYff4iDjWFpiTte4P+trwJPpIAyCBf53sNw2aDNQ=
-=dB5a
+iEYEAREKAAYFAk9bFVoACgkQgAnW8HDreRZQfgCgi4cRU0TBPccq5tV6E4AgQppt
+iWIAoMkU70y/c1f1UbWRzA+JRHXx2jeX
+=ZhvK
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-3.0.4.ebuild b/app-editors/scite/scite-3.0.4.ebuild
new file mode 100644
index 000000000000..94c5bb588d18
--- /dev/null
+++ b/app-editors/scite/scite-3.0.4.ebuild
@@ -0,0 +1,88 @@
+# 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.0.4.ebuild,v 1.1 2012/03/10 08:48:21 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"
+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}
+	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#^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"
+	insinto /usr/share/applications
+	doins "${FILESDIR}/scite.desktop"
+
+	doman ../doc/scite.1
+	dodoc ../README
+}