[gentoo-commits] proj/sunrise:master commit in: dev-util/monkeystudio/

[gentoo-commits] proj/sunrise:master commit in: dev-util/monkeystudio/

[Michael Palimaka]

commit:     04a3c66aaef8b27e8ba909063cedca1789d38162
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Mon Apr  2 16:03:32 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Mon Apr  2 16:03:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sunrise.git;a=commit;h=04a3c66a

Revert "dev-util/monkeystudio: Version bump. Thanks to floppym, hasufell, and Tommy[D] for review."

This is because I failed to use 'git mv'.

This reverts commit c0d8947deeb0a11c852d9bd68f14bf06af75e8d2.

---
 dev-util/monkeystudio/ChangeLog                    |    8 +--
 dev-util/monkeystudio/monkeystudio-1.5.2.ebuild    |   37 ++++++++++++
 .../monkeystudio/monkeystudio-1.9.0.1_p4332.ebuild |   61 --------------------
 3 files changed, 38 insertions(+), 68 deletions(-)

diff --git a/dev-util/monkeystudio/ChangeLog b/dev-util/monkeystudio/ChangeLog
index 02686ce..9f66c74 100644
--- a/dev-util/monkeystudio/ChangeLog
+++ b/dev-util/monkeystudio/ChangeLog
@@ -1,13 +1,7 @@
 # ChangeLog for dev-util/monkeystudio
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*monkeystudio-1.9.0.1_p4332 (02 Apr 2012)
-
-  02 Apr 2012; Michael Palimaka (kensington) <kensington@astralcloak.net>
-  -monkeystudio-1.5.2.ebuild, +monkeystudio-1.9.0.1_p4332.ebuild:
-  Version bump. Thanks to floppym, hasufell, and Tommy[D] for review.
-
   12 Jan 2010; Markos Chandras <hwoarang@gentoo.org>
   monkeystudio-1.5.2.ebuild:
   Migrate to qt4-r2 eclass

diff --git a/dev-util/monkeystudio/monkeystudio-1.5.2.ebuild b/dev-util/monkeystudio/monkeystudio-1.5.2.ebuild
new file mode 100644
index 0000000..e606bd5
--- /dev/null
+++ b/dev-util/monkeystudio/monkeystudio-1.5.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit qt4-r2
+
+MY_PN="${PN}-src"
+
+DESCRIPTION="Monkey Studio is a cross platform Qt 4 IDE"
+HOMEPAGE="http://monkeystudio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.zip"
+
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-sql:4"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	sed -i \
+		-e 's#/build/#build/#g' \
+		"${S}/monkey.pro" || die "build-dir fix failed"
+}
+
+src_install() {
+	dodoc {Readme,ToDo,WishList,Informations,Changes,Bugs}.txt
+	dobin binary/monkey_x11
+	dosym monkey_x11 /usr/bin/monkeystudio
+	use doc && dohtml -r docqt4ds/english/html/*
+}

diff --git a/dev-util/monkeystudio/monkeystudio-1.9.0.1_p4332.ebuild b/dev-util/monkeystudio/monkeystudio-1.9.0.1_p4332.ebuild
deleted file mode 100644
index f9e9f17..0000000
--- a/dev-util/monkeystudio/monkeystudio-1.9.0.1_p4332.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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
-}

[gentoo-commits] proj/sunrise:master commit in: dev-util/monkeystudio/

[Michael Palimaka]

commit:     676c122cf579b0740cce996f5749d5e5b5acfa4b
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Mon Apr  2 16:06:55 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Mon Apr  2 16:06:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sunrise.git;a=commit;h=676c122c

dev-util/monkeystudio: Version bump. Thanks to floppym, hasufell, and Tommy[D] for review.

---
 dev-util/monkeystudio/ChangeLog                    |    8 ++-
 dev-util/monkeystudio/monkeystudio-1.5.2.ebuild    |   37 ------------
 .../monkeystudio/monkeystudio-1.9.0.1_p4332.ebuild |   61 ++++++++++++++++++++
 3 files changed, 68 insertions(+), 38 deletions(-)

diff --git a/dev-util/monkeystudio/ChangeLog b/dev-util/monkeystudio/ChangeLog
index 9f66c74..02686ce 100644
--- a/dev-util/monkeystudio/ChangeLog
+++ b/dev-util/monkeystudio/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-util/monkeystudio
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*monkeystudio-1.9.0.1_p4332 (02 Apr 2012)
+
+  02 Apr 2012; Michael Palimaka (kensington) <kensington@astralcloak.net>
+  -monkeystudio-1.5.2.ebuild, +monkeystudio-1.9.0.1_p4332.ebuild:
+  Version bump. Thanks to floppym, hasufell, and Tommy[D] for review.
+
   12 Jan 2010; Markos Chandras <hwoarang@gentoo.org>
   monkeystudio-1.5.2.ebuild:
   Migrate to qt4-r2 eclass

diff --git a/dev-util/monkeystudio/monkeystudio-1.5.2.ebuild b/dev-util/monkeystudio/monkeystudio-1.5.2.ebuild
deleted file mode 100644
index e606bd5..0000000
--- a/dev-util/monkeystudio/monkeystudio-1.5.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit qt4-r2
-
-MY_PN="${PN}-src"
-
-DESCRIPTION="Monkey Studio is a cross platform Qt 4 IDE"
-HOMEPAGE="http://monkeystudio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.zip"
-
-KEYWORDS="~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="x11-libs/qt-gui:4
-	x11-libs/qt-sql:4"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	sed -i \
-		-e 's#/build/#build/#g' \
-		"${S}/monkey.pro" || die "build-dir fix failed"
-}
-
-src_install() {
-	dodoc {Readme,ToDo,WishList,Informations,Changes,Bugs}.txt
-	dobin binary/monkey_x11
-	dosym monkey_x11 /usr/bin/monkeystudio
-	use doc && dohtml -r docqt4ds/english/html/*
-}

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
+}