Version bump.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

7 files changed, 32 insertions, 196 deletions

diff --git a/x11-misc/vym/ChangeLog b/x11-misc/vym/ChangeLog
index c461d1e3a075..6c161bdd7de4 100644
--- a/x11-misc/vym/ChangeLog
+++ b/x11-misc/vym/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/vym
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.34 2013/10/20 23:35:37 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.35 2014/05/04 23:51:48 jer Exp $
+
+*vym-2.3.22 (04 May 2014)
+
+  04 May 2014; Jeroen Roovers <jer@gentoo.org> -vym-2.2.4.ebuild,
+  -vym-2.3.8.ebuild, -vym-2.3.11.ebuild, -vym-2.3.18.ebuild,
+  -vym-2.3.20.ebuild, +vym-2.3.22.ebuild, +files/vym-2.3.22-arrowobj.patch:
+  Version bump.
 
 *vym-2.3.20 (20 Oct 2013)
 
diff --git a/x11-misc/vym/files/vym-2.3.22-arrowobj.patch b/x11-misc/vym/files/vym-2.3.22-arrowobj.patch
new file mode 100644
index 000000000000..5c1cd6fc57c0
--- /dev/null
+++ b/x11-misc/vym/files/vym-2.3.22-arrowobj.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,6 +69,7 @@
+       aboutdialog.h
+       taskfiltermodel.h
+       animpoint.h
++      arrowobj.h
+       attribute.h
+       attributeitem.h
+       #   attributedelegate.h
+@@ -156,6 +157,7 @@
+       aboutdialog.cpp
+       taskfiltermodel.cpp
+       animpoint.cpp
++      arrowobj.cpp
+       attribute.cpp
+       attributeitem.cpp
+       #   attributedelegate.cpp
diff --git a/x11-misc/vym/vym-2.2.4.ebuild b/x11-misc/vym/vym-2.2.4.ebuild
deleted file mode 100644
index 823a8b394e3a..000000000000
--- a/x11-misc/vym/vym-2.2.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.2.4.ebuild,v 1.2 2013/03/02 23:54:15 hwoarang Exp $
-
-EAPI=4
-inherit eutils qt4-r2
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtdbus:4
-	dev-qt/qtgui:4[qt3support]
-	dev-qt/qtsvg:4"
-RDEPEND="${DEPEND}
-	app-arch/zip"
-
-DOCS="README.txt"
-
-src_configure() {
-	eqmake4 PREFIX=/usr DOCDIR=/usr/share/doc/${PF}
-}
-
-src_install() {
-	qt4-r2_src_install
-	doman doc/vym.1.gz
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.3.11.ebuild b/x11-misc/vym/vym-2.3.11.ebuild
deleted file mode 100644
index a7a6081e8b54..000000000000
--- a/x11-misc/vym/vym-2.3.11.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.3.11.ebuild,v 1.4 2013/03/02 23:54:15 hwoarang Exp $
-
-EAPI=5
-inherit eutils qt4-r2
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-VYM_LINGUAS=( cs_CZ de_DE es fr ia it pt_BR ru sv zh_CN zh_TW )
-IUSE+=" ${VYM_LINGUAS[@]/#/linguas_}"
-
-DEPEND="
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4[qt3support]
-	dev-qt/qtsvg:4
-"
-RDEPEND="
-	${DEPEND}
-	app-arch/zip
-"
-
-DOCS="README.txt"
-
-src_prepare() {
-	local lingua
-	for lingua in ${VYM_LINGUAS[@]}; do
-		if ! use linguas_${lingua}; then
-			sed -i \
-				"/lang\/vym_${lingua}.ts/d" \
-				CMakeLists.txt || die
-			rm -r lang/vym_${lingua}.ts || die
-		fi
-	done
-	sed -i \
-		-e '/lang\/vym_en.ts/d' \
-		CMakeLists.txt || die
-	rm -r lang/vym_en.ts || die
-}
-
-src_configure() {
-	eqmake4 PREFIX=/usr DOCDIR=/usr/share/doc/${PF}
-}
-
-src_install() {
-	qt4-r2_src_install
-	doman doc/vym.1.gz
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.3.20.ebuild b/x11-misc/vym/vym-2.3.20.ebuild
deleted file mode 100644
index 83083eb3c354..000000000000
--- a/x11-misc/vym/vym-2.3.20.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.3.20.ebuild,v 1.1 2013/10/20 23:35:37 jer Exp $
-
-EAPI=5
-inherit eutils cmake-utils
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-
-VYM_LINGUAS=( cs_CZ de_DE es fr ia it pt_BR ru sv zh_CN zh_TW )
-IUSE+=" ${VYM_LINGUAS[@]/#/linguas_}"
-
-DEPEND="
-	dev-qt/qtgui:4[qt3support]
-	dev-qt/qtsvg:4
-	dbus? ( dev-qt/qtdbus:4 )
-"
-RDEPEND="
-	${DEPEND}
-	app-arch/zip
-"
-
-DOCS=( README.txt doc/vym.pdf )
-
-src_prepare() {
-	local lingua
-	for lingua in ${VYM_LINGUAS[@]}; do
-		if ! use linguas_${lingua}; then
-			sed -i \
-				"/lang\/vym_${lingua}.ts/d" \
-				CMakeLists.txt || die
-			rm -r lang/vym_${lingua}.ts || die
-		fi
-	done
-	sed -i \
-		-e '/lang\/vym_en.ts/d' \
-		CMakeLists.txt || die
-	rm -r lang/vym_en.ts || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use !dbus NO_DBUS)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doman doc/vym.1.gz
-	if use linguas_es ; then
-		dodoc doc/vym_es.pdf
-	elif use linguas_fr ; then
-		dodoc doc/vym_fr.pdf
-	fi
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.3.18.ebuild b/x11-misc/vym/vym-2.3.22.ebuild
index 8a835b5adfa8..00bc6f32e81d 100644
--- a/x11-misc/vym/vym-2.3.18.ebuild
+++ b/x11-misc/vym/vym-2.3.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.3.18.ebuild,v 1.1 2013/07/09 11:38:38 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.3.22.ebuild,v 1.1 2014/05/04 23:51:48 jer Exp $
 
 EAPI=5
 inherit eutils cmake-utils
@@ -30,12 +30,12 @@ RDEPEND="
 DOCS=( README.txt doc/vym.pdf )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-arrowobj.patch
+
 	local lingua
 	for lingua in ${VYM_LINGUAS[@]}; do
 		if ! use linguas_${lingua}; then
-			sed -i \
-				"/lang\/vym_${lingua}.ts/d" \
-				CMakeLists.txt || die
+			sed -i -e "/lang\/vym_${lingua}.ts/d" CMakeLists.txt || die
 			rm -r lang/vym_${lingua}.ts || die
 		fi
 	done
diff --git a/x11-misc/vym/vym-2.3.8.ebuild b/x11-misc/vym/vym-2.3.8.ebuild
deleted file mode 100644
index 0a618f65ba48..000000000000
--- a/x11-misc/vym/vym-2.3.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-2.3.8.ebuild,v 1.2 2013/03/02 23:54:15 hwoarang Exp $
-
-EAPI=4
-inherit eutils qt4-r2
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4[qt3support]
-	dev-qt/qtsvg:4
-"
-RDEPEND="
-	${DEPEND}
-	app-arch/zip
-"
-
-DOCS="README.txt"
-
-src_configure() {
-	eqmake4 PREFIX=/usr DOCDIR=/usr/share/doc/${PF}
-}
-
-src_install() {
-	qt4-r2_src_install
-	doman doc/vym.1.gz
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}