Version bump (bug #477366 by teidakankan).

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

5 files changed, 15 insertions, 114 deletions

diff --git a/x11-misc/parcellite/ChangeLog b/x11-misc/parcellite/ChangeLog
index ddda8cbfa1b9..16d49d4c4c34 100644
--- a/x11-misc/parcellite/ChangeLog
+++ b/x11-misc/parcellite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/parcellite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/parcellite/ChangeLog,v 1.27 2013/02/18 11:06:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/parcellite/ChangeLog,v 1.28 2013/07/19 12:50:42 jer Exp $
+
+*parcellite-1.1.5 (19 Jul 2013)
+
+  19 Jul 2013; Jeroen Roovers <jer@gentoo.org> -parcellite-1.0.2_rc5.ebuild,
+  -parcellite-1.0.2_rc5-r1.ebuild, -parcellite-1.0.2_rc6.ebuild,
+  +parcellite-1.1.5.ebuild, -files/parcellite-1.0.2_rc5-glib-2.31.patch:
+  Version bump (bug #477366 by teidakankan).
 
   18 Feb 2013; Agostino Sarubbo <ago@gentoo.org> parcellite-1.1.4.ebuild:
   Stable for x86, wrt bug #457948
diff --git a/x11-misc/parcellite/files/parcellite-1.0.2_rc5-glib-2.31.patch b/x11-misc/parcellite/files/parcellite-1.0.2_rc5-glib-2.31.patch
deleted file mode 100644
index 7d1e8e6f7dd9..000000000000
--- a/x11-misc/parcellite/files/parcellite-1.0.2_rc5-glib-2.31.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/412365
-
---- src/keybinder.h
-+++ src/keybinder.h
-@@ -20,7 +20,7 @@
- #ifndef __KEY_BINDER_H__
- #define __KEY_BINDER_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/x11-misc/parcellite/parcellite-1.0.2_rc5-r1.ebuild b/x11-misc/parcellite/parcellite-1.0.2_rc5-r1.ebuild
deleted file mode 100644
index 6387ca4b5c8d..000000000000
--- a/x11-misc/parcellite/parcellite-1.0.2_rc5-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/parcellite/parcellite-1.0.2_rc5-r1.ebuild,v 1.1 2012/09/28 15:50:45 jer Exp $
-
-EAPI=4
-inherit autotools eutils fdo-mime
-
-MY_P=${PN}-${PV/_}
-
-DESCRIPTION="A lightweight GTK+ based clipboard manager."
-HOMEPAGE="http://parcellite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-PL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN"
-for lingua in ${PL_LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-RDEPEND=">=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.10:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-glib-2.31.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-misc/parcellite/parcellite-1.0.2_rc5.ebuild b/x11-misc/parcellite/parcellite-1.0.2_rc5.ebuild
deleted file mode 100644
index 74b7e4a321ab..000000000000
--- a/x11-misc/parcellite/parcellite-1.0.2_rc5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/parcellite/parcellite-1.0.2_rc5.ebuild,v 1.5 2012/09/28 14:57:59 jer Exp $
-
-EAPI=4
-inherit autotools eutils fdo-mime
-
-MY_P=${PN}-${PV/_}
-
-DESCRIPTION="A lightweight GTK+ based clipboard manager."
-HOMEPAGE="http://parcellite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.10:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-glib-2.31.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-misc/parcellite/parcellite-1.0.2_rc6.ebuild b/x11-misc/parcellite/parcellite-1.1.5.ebuild
index 7ad29951b70f..21ee018efe82 100644
--- a/x11-misc/parcellite/parcellite-1.0.2_rc6.ebuild
+++ b/x11-misc/parcellite/parcellite-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/parcellite/parcellite-1.0.2_rc6.ebuild,v 1.1 2013/01/14 21:43:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/parcellite/parcellite-1.1.5.ebuild,v 1.1 2013/07/19 12:50:42 jer Exp $
 
 EAPI=4
 inherit fdo-mime
@@ -16,10 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-PL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN"
-for lingua in ${PL_LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
+PL_LINGUAS=( ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN )
+IUSE+=" ${PL_LINGUAS[@]/#/linguas_}"
 
 RDEPEND=">=dev-libs/glib-2.14
 	>=x11-libs/gtk+-2.10:2"
@@ -32,6 +30,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	sed -i data/${PN}.desktop.in -e 's:Application;::g' || die
+}
+
 src_configure() {
 	econf $(use_enable nls)
 }