[gentoo-commits] proj/qt:master commit in: dev-util/monkeystudio/files/, dev-util/monkeystudio/

[Michael Palimaka]

commit:     c0904b25b7fe51d136dda241920dc69e0919bf20
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Mon Apr  2 14:36:33 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Mon Apr  2 14:36:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c0904b25

Version bump, remove old.

(Portage version: 2.1.10.54/git/Linux x86_64, unsigned Manifest commit)

---
 dev-util/monkeystudio/Manifest                     |    2 +-
 .../monkeystudio/files/qscintilla_headers.patch    |   14 -----
 .../monkeystudio/monkeystudio-1.8.4.0_beta1.ebuild |   46 ---------------
 .../monkeystudio/monkeystudio-1.9.0.1_p4332.ebuild |   61 ++++++++++++++++++++
 4 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/dev-util/monkeystudio/Manifest b/dev-util/monkeystudio/Manifest
index 3d9a33b..c0afffc 100644
--- a/dev-util/monkeystudio/Manifest
+++ b/dev-util/monkeystudio/Manifest
@@ -1 +1 @@
-DIST mks_1.8.4.0b1-svn3231-src.tar.gz 5288896 RMD160 81d4a53480997199cba08d28291edc8c9640a9c7 SHA1 a85e956561539378038fb9f07cb5273276c1adb7 SHA256 b2a777f94de14804538fedfd09893e2d11b43e60d35fa1402f2847852a145f49
+DIST mks_1.9.0.1-svn4332-src.tar.gz 7072057 SHA256 ede78fe98b4e0140fd134969ddc578577ff2688546b4453e00e20a85c00e0dca SHA512 58790cf9aa6d597e2f93d10f39055a709815c122b4238dcc1a3643ecf884b8a4969d3ffa3626515df95c6cbccc3834af8b95a4c369e538d5da5d967a31c8dcaf WHIRLPOOL fbba1c9edd55402ec486f4fb67ea43bf740a159b6c7715e35f8ab4d473b7401185e01e4a8e4029a1a25c2259574955307bee99814ea1a88ad7511106e402c35b

diff --git a/dev-util/monkeystudio/files/qscintilla_headers.patch b/dev-util/monkeystudio/files/qscintilla_headers.patch
deleted file mode 100644
index 94e7b40..0000000
--- a/dev-util/monkeystudio/files/qscintilla_headers.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: version-1.8.4.0b1/monkey/monkey.pri
-===================================================================
---- version-1.8.4.0b1.orig/monkey/monkey.pri
-+++ version-1.8.4.0b1/monkey/monkey.pri
-@@ -3,6 +3,9 @@
- 
- # include path
- INCLUDEPATH	*= $$PWD/sdk
-+INCLUDEPATH     += $$PWD/qscintilla/sdk
-+INCLUDEPATH     += /usr/include/Qsci/
-+
- DEPENDPATH	*= $$PWD/src
- 
- CONFIG -= debug_and_release debug

diff --git a/dev-util/monkeystudio/monkeystudio-1.8.4.0_beta1.ebuild b/dev-util/monkeystudio/monkeystudio-1.8.4.0_beta1.ebuild
deleted file mode 100644
index 8b9b9ad..0000000
--- a/dev-util/monkeystudio/monkeystudio-1.8.4.0_beta1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit qt4
-
-MY_PN="mks"
-MY_PV="${PV/_beta/b}-svn3231"
-MY_P="${MY_PN}_${MY_PV}-src"
-
-DESCRIPTION="Monkey Studio is a cross platform Qt 4 IDE"
-HOMEPAGE="http://monkeystudio.sourceforge.net/"
-SRC_URI="http://monkeystudio.googlecode.com/files/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="|| ( GPL-2 GPL-3 LGPL-3 )"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="x11-libs/qt-gui:4
-	x11-libs/qt-sql:4
-	x11-libs/qscintilla"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/qscintilla_headers.patch"
-)
-
-S="${WORKDIR}/${MY_P/-src/}/version-${PV/_beta/b}"
-
-src_prepare() {
-	#fix Qscintilla include directory. Upstream failed. How odd
-	sed -i -e "s/\ \"/\ </" -e "s/\"$/>/" "${S}/qscintilla/sdk/qscintilla.h" \
-		|| die "failed to fix qscintilla headers"
-	qt4_src_prepare
-}
-
-src_configure() {
-	eqmake4 build.pro prefix=/usr system_qscintilla=1
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	dodoc readme.txt ChangeLog || die "dodoc failed"
-}

diff --git a/dev-util/monkeystudio/monkeystudio-1.9.0.1_p4332.ebuild b/dev-util/monkeystudio/monkeystudio-1.9.0.1_p4332.ebuild
new file mode 100644
index 0000000..f9e9f17
--- /dev/null
+++ b/dev-util/monkeystudio/monkeystudio-1.9.0.1_p4332.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+LANGS="be es fr ru"
+
+inherit qt4-r2
+
+MY_P="mks_${PV/_p/-svn}-src"
+
+DESCRIPTION="A cross platform Qt 4 IDE"
+HOMEPAGE="http://monkeystudio.sourceforge.net/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 )"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/qt-assistant-4.7.0:4
+	>=x11-libs/qt-core-4.7.0:4
+	>=x11-libs/qt-gui-4.7.0:4
+	>=x11-libs/qt-sql-4.7.0:4
+	x11-libs/qscintilla"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.5.8 )"
+
+DOCS="ChangeLog readme.txt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -e "s:datas/\*:datas/apis datas/scripts datas/templates:" \
+		-i installs.pri || die "sed installs.pri failed"
+
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	eqmake4 build.pro prefix=/usr system_qscintilla=1
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	insinto /usr/share/${PN}/translations
+	local lang
+	for lang in ${LANGS} ; do
+		if use linguas_${lang} ; then
+			doins datas/translations/monkeystudio_${lang}.qm
+		fi
+	done
+
+	fperms 755 /usr/bin/${PN}
+
+	if use doc ; then
+		doxygen || die "doxygen failed"
+		dohtml -r doc/html/*
+	fi
+}