Drop old/never-stabilized geany-plugins-0.20.0-r1 and succeeded geany-plugins-1.22.

(Portage version: 2.2.0_alpha163-r2/cvs/Linux x86_64, signed Manifest commit with key 743A52E86BA81050)

5 files changed, 9 insertions, 431 deletions

diff --git a/dev-util/geany-plugins/ChangeLog b/dev-util/geany-plugins/ChangeLog
index 9cedd3bd40b2..a64cd477e477 100644
--- a/dev-util/geany-plugins/ChangeLog
+++ b/dev-util/geany-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/geany-plugins
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/ChangeLog,v 1.25 2012/12/07 18:30:48 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/ChangeLog,v 1.26 2013/03/07 04:18:39 binki Exp $
+
+  07 Mar 2013; Nathan Phillip Brink <binki@gentoo.org>
+  -files/geany-plugins-0.20-config.h.patch,
+  -files/geany-plugins-0.20-geanyprj-outsrc-tests.patch,
+  -geany-plugins-0.20-r1.ebuild, -geany-plugins-1.22.ebuild:
+  Drop old/never-stabilized geany-plugins-0.20.0-r1 and succeeded geany-
+  plugins-1.22.
 
   07 Dec 2012; Agostino Sarubbo <ago@gentoo.org> geany-plugins-1.22-r1.ebuild:
   Stable for ppc, wrt bug #441312
diff --git a/dev-util/geany-plugins/files/geany-plugins-0.20-config.h.patch b/dev-util/geany-plugins/files/geany-plugins-0.20-config.h.patch
deleted file mode 100644
index aaf8e0bdf6e4..000000000000
--- a/dev-util/geany-plugins/files/geany-plugins-0.20-config.h.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-------------------------------------------------------------------------
-r2133 | frlan | 2011-08-13 22:09:16 +0000 (Sat, 13 Aug 2011) | 1 line
-
-GeanyLaTeX: Fix build of plugin due to not properly included config.h
-------------------------------------------------------------------------
-Index: geanylatex/src/geanylatex.c
-===================================================================
---- geanylatex/src/geanylatex.c	(revision 2132)
-+++ geanylatex/src/geanylatex.c	(revision 2133)
-@@ -25,6 +25,11 @@
- /* LaTeX plugin */
- /* This plugin improves the work with LaTeX and Geany.*/
- 
-+
-+#ifdef HAVE_CONFIG_H
-+# include "config.h" /* for the gettext domain */
-+#endif
-+
- #include "geanylatex.h"
- #include "ctype.h"
- 
-------------------------------------------------------------------------
-r2135 | frlan | 2011-08-13 22:10:02 +0000 (Sat, 13 Aug 2011) | 1 line
-
-Fix build of geanylipsum plugin due to not properly included config.h
-------------------------------------------------------------------------
-Index: geanylipsum/src/geanylipsum.c
-===================================================================
---- geanylipsum/src/geanylipsum.c	(revision 2134)
-+++ geanylipsum/src/geanylipsum.c	(revision 2135)
-@@ -20,6 +20,10 @@
- 
- #include "geanyplugin.h"
- 
-+#ifdef HAVE_CONFIG_H
-+	#include "config.h" /* for the gettext domain */
-+#endif
-+
- #include <string.h>
- #ifdef HAVE_LOCALE_H
- # include <locale.h>
-------------------------------------------------------------------------
-r2136 | frlan | 2011-08-13 22:10:30 +0000 (Sat, 13 Aug 2011) | 1 line
-
-Fix build of geanysendmail plugin due to not properly included config.h
-------------------------------------------------------------------------
-Index: geanysendmail/src/geanysendmail.c
-===================================================================
---- geanysendmail/src/geanysendmail.c	(revision 2135)
-+++ geanysendmail/src/geanysendmail.c	(revision 2136)
-@@ -26,6 +26,9 @@
- #include "geanyplugin.h"
- #include "icon.h"
- 
-+#ifdef HAVE_CONFIG_H
-+	#include "config.h" /* for the gettext domain */
-+#endif
- 
- #ifdef HAVE_LOCALE_H
- # include <locale.h>
-------------------------------------------------------------------------
-r2137 | frlan | 2011-08-13 22:15:21 +0000 (Sat, 13 Aug 2011) | 1 line
-
-Fix build of updatechecker and tableconvert due to not properly included config.h
-------------------------------------------------------------------------
-Index: updatechecker/src/updatechecker.c
-===================================================================
---- updatechecker/src/updatechecker.c	(revision 2136)
-+++ updatechecker/src/updatechecker.c	(revision 2137)
-@@ -24,6 +24,11 @@
- #include "libsoup/soup.h"
- #include "stdlib.h"
- 
-+#ifdef HAVE_CONFIG_H
-+	#include "config.h" /* for the gettext domain */
-+#endif
-+
-+
- GeanyPlugin     *geany_plugin;
- GeanyData       *geany_data;
- GeanyFunctions  *geany_functions;
-------------------------------------------------------------------------
-r2138 | eht16 | 2011-08-14 10:03:52 +0000 (Sun, 14 Aug 2011) | 1 line
-
-Move include of config.h to the top
-------------------------------------------------------------------------
-Index: addons/src/addons.c
-===================================================================
---- addons/src/addons.c	(revision 2137)
-+++ addons/src/addons.c	(revision 2138)
-@@ -22,5 +22,9 @@
-  */
- 
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include "geanyplugin.h"
- 
-------------------------------------------------------------------------
-r2139 | eht16 | 2011-08-14 10:19:27 +0000 (Sun, 14 Aug 2011) | 1 line
-
-Properly include config.h as needed (after the implicit has been correctly removed from Geany's core)
-------------------------------------------------------------------------
-Index: geanyprj/src/geanyprj.c
-===================================================================
---- geanyprj/src/geanyprj.c	(revision 2138)
-+++ geanyprj/src/geanyprj.c	(revision 2139)
-@@ -20,6 +20,10 @@
-  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <sys/time.h>
- #include <string.h>
- 
-===================================================================
-===================================================================
---- treebrowser/src/treebrowser.c	(revision 2138)
-+++ treebrowser/src/treebrowser.c	(revision 2139)
-@@ -4,6 +4,10 @@
-  *      Copyright 2010 Adrian Dimitrov <dimitrov.adrian@gmail.com>
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <string.h>
-===================================================================
---- geanylua/geanylua.c	(revision 2138)
-+++ geanylua/geanylua.c	(revision 2139)
-@@ -30,7 +30,11 @@
-  */
- 
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
- 
-+
- #include "geany.h"
- #include "plugindata.h"
- #include "keybindings.h"
-===================================================================
---- geanylua/glspi.h	(revision 2138)
-+++ geanylua/glspi.h	(revision 2139)
-@@ -6,6 +6,10 @@
-  */
- 
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <lua.h>
- #include <lualib.h>
- #include <lauxlib.h>
-===================================================================
---- geanyinsertnum/src/insertnum.c	(revision 2138)
-+++ geanyinsertnum/src/insertnum.c	(revision 2139)
-@@ -17,6 +17,10 @@
-  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <ctype.h>
- #include <limits.h>
- #include <stdlib.h>
-===================================================================
-===================================================================
---- geanygdb/src/gdb-io-stack.c	(revision 2138)
-+++ geanygdb/src/gdb-io-stack.c	(revision 2139)
-@@ -17,6 +17,10 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <string.h>
- #include <glib.h>
- 
-===================================================================
---- geanygdb/src/geanygdb.c	(revision 2138)
-+++ geanygdb/src/geanygdb.c	(revision 2139)
-@@ -20,6 +20,10 @@
-  */
- 
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <glib/gstdio.h>
- 
- #include "geanyplugin.h"
-===================================================================
---- geanygdb/src/gdb-ui-main.c	(revision 2138)
-+++ geanygdb/src/gdb-ui-main.c	(revision 2139)
-@@ -18,6 +18,10 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-===================================================================
-===================================================================
---- shiftcolumn/src/shiftcolumn.c	(revision 2138)
-+++ shiftcolumn/src/shiftcolumn.c	(revision 2139)
-@@ -19,6 +19,10 @@
-  */
- 
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include "geany.h"
- #include "support.h"
- 
-===================================================================
---- pretty-printer/src/PrettyPrinter.h	(revision 2138)
-+++ pretty-printer/src/PrettyPrinter.h	(revision 2139)
-@@ -21,6 +21,10 @@
- 
- //========================================== INCLUDES ==========================================================
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-===================================================================
---- geanyextrasel/src/extrasel.c	(revision 2138)
-+++ geanyextrasel/src/extrasel.c	(revision 2139)
-@@ -17,6 +17,10 @@
-  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <gdk/gdkkeysyms.h>
- 
- #include "geanyplugin.h"
-===================================================================
---- spellcheck/src/scplugin.c	(revision 2138)
-+++ spellcheck/src/scplugin.c	(revision 2139)
-@@ -23,6 +23,10 @@
-  */
- 
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include "geanyplugin.h"
- 
- 
diff --git a/dev-util/geany-plugins/files/geany-plugins-0.20-geanyprj-outsrc-tests.patch b/dev-util/geany-plugins/files/geany-plugins-0.20-geanyprj-outsrc-tests.patch
deleted file mode 100644
index a8aa4c13f7f1..000000000000
--- a/dev-util/geany-plugins/files/geany-plugins-0.20-geanyprj-outsrc-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Date: 2011/01/20
-Purpose: Fix test compilation failure in geanyprj for out-of-source builds.
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3163117&group_id=222729&atid=1056532
-
---- a/geany-plugins/geanyprj/tests/Makefile.am
-+++ b/geany-plugins/geanyprj/tests/Makefile.am
-@@ -1,6 +1,6 @@
- if UNITTESTS
- include $(top_srcdir)/build/vars.build.mk
--INCLUDES = $(GEANY_CFLAGS) -I../src -DUNITTESTS
-+INCLUDES = $(GEANY_CFLAGS) -I$(srcdir)/../src -DUNITTESTS
- TESTS=unittests
- noinst_PROGRAMS=unittests
- unittests_SOURCES = unittests.c ../src/utils.c
diff --git a/dev-util/geany-plugins/geany-plugins-0.20-r1.ebuild b/dev-util/geany-plugins/geany-plugins-0.20-r1.ebuild
deleted file mode 100644
index de94009cb212..000000000000
--- a/dev-util/geany-plugins/geany-plugins-0.20-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-0.20-r1.ebuild,v 1.6 2012/05/04 17:51:45 jdhore Exp $
-
-EAPI="2"
-
-inherit autotools autotools-utils eutils versionator
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="http://plugins.geany.org/geany-plugins"
-SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="enchant gtkspell lua nls soup webkit"
-
-LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
-
-RDEPEND=">=dev-util/geany-$(get_version_component_range 1-2)
-	dev-libs/libxml2:2
-	dev-libs/glib:2
-	enchant? ( app-text/enchant )
-	gtkspell? ( app-text/gtkspell:2 )
-	lua? ( dev-lang/lua )
-	soup? ( net-libs/libsoup )
-	webkit? (
-		net-libs/webkit-gtk:2
-		x11-libs/gtk+:2
-		x11-libs/gdk-pixbuf:2
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_prepare() {
-	# https://sourceforge.net/tracker/?func=detail&aid=3163117&group_id=222729&atid=1056532
-	epatch "${FILESDIR}"/${P}-geanyprj-outsrc-tests.patch
-
-	# geany-0.21 doesn't have #include <config.h> in its geanyplugin.h,
-	# breaking <=geany-plugins-0.20.
-	epatch "${FILESDIR}"/${P}-config.h.patch
-
-	eautomake
-}
-
-src_configure() {
-	# GeanyGenDoc requires ctpl which isn't yet in portage
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}
-		--disable-geanygendoc
-		$(use_enable enchant spellcheck)
-		$(use_enable gtkspell)
-		$(use_enable lua geanylua)
-		$(use_enable nls)
-		$(use_enable soup updatechecker)
-		$(use_enable webkit webhelper)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.22.ebuild b/dev-util/geany-plugins/geany-plugins-1.22.ebuild
deleted file mode 100644
index b91a4dfb4cc6..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.22.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-1.22.ebuild,v 1.5 2012/09/27 00:11:29 blueness Exp $
-
-EAPI=4
-
-inherit autotools-utils versionator
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="http://plugins.geany.org/geany-plugins"
-SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debugger devhelp enchant gpg gtkspell lua nls soup webkit"
-
-LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
-
-RDEPEND=">=dev-util/geany-$(get_version_component_range 1-2)
-	dev-libs/libxml2:2
-	dev-libs/glib:2
-	debugger? ( x11-libs/vte:0 )
-	devhelp? (
-		dev-util/devhelp
-		gnome-base/gconf:2
-		net-libs/webkit-gtk:2
-		x11-libs/gtk+:2
-		x11-libs/libwnck:1
-		)
-	enchant? ( app-text/enchant )
-	gpg? ( app-crypt/gpgme )
-	gtkspell? ( app-text/gtkspell:2 )
-	lua? ( dev-lang/lua )
-	soup? ( net-libs/libsoup )
-	webkit? (
-		net-libs/webkit-gtk:2
-		x11-libs/gtk+:2
-		x11-libs/gdk-pixbuf:2
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_configure() {
-	# GeanyGenDoc requires ctpl which isn't yet in portage
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		--disable-geanygendoc
-		--disable-multiterm
-		--enable-geanygdb
-		--enable-geanymacro
-		--enable-geanynumberedbookmarks
-		--enable-gproject
-		--enable-pretty-printer
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable devhelp)
-		$(use_enable enchant spellcheck)
-		$(use_enable gpg geanypg)
-		$(use_enable gtkspell)
-		$(use_enable lua geanylua)
-		$(use_enable nls)
-		# Having updatechecker... when you're using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable soup geniuspaste)
-		$(use_enable webkit webhelper)
-	)
-
-	autotools-utils_src_configure
-}