[gentoo-commits] proj/gnome:gnome-next commit in: app-editors/ghex/files/, app-editors/ghex/

[Alexandre Restovtsev]

commit:     7c7064e769b733589c35739659a34414e5e47cb5
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Sep 27 18:04:59 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Sep 27 18:11:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7c7064e7

app-editors/ghex: unslot (#384557) and remove 3.0.0 (now in gx86)

After a discussion on IRC, it appears that nobody wants to support a
slotted ghex, so slotmoving "3" back to "2". Since the (unslotted)
ghex-3.0.0 is already in gx86, remove it and replace with a live ebuild.

---
 .../files/ghex-2.24.0-build-libgtkhex-only.patch   |  116 --------------------
 app-editors/ghex/ghex-2.24.0-r200.ebuild           |   43 -------
 .../ghex/{ghex-3.0.0.ebuild => ghex-9999.ebuild}   |   16 ++--
 3 files changed, 8 insertions(+), 167 deletions(-)

diff --git a/app-editors/ghex/files/ghex-2.24.0-build-libgtkhex-only.patch b/app-editors/ghex/files/ghex-2.24.0-build-libgtkhex-only.patch
deleted file mode 100644
index 5e8e4e8..0000000
--- a/app-editors/ghex/files/ghex-2.24.0-build-libgtkhex-only.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index e121e68..53bb8b1 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,10 +2,10 @@
- 
- DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-schemas-install
- 
--SUBDIRS = po src help icons
-+SUBDIRS = po src
- 
--schemadir = $(GCONF_SCHEMA_FILE_DIR)
--schema_DATA = ghex2.schemas
-+#schemadir = $(GCONF_SCHEMA_FILE_DIR)
-+#schema_DATA = ghex2.schemas
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = gtkhex.pc
-@@ -25,22 +25,22 @@ EXTRA_DIST =			\
- dist-hook: ghex.spec
- 	cp ghex.spec $(distdir)
- 
--desktopdir = $(datadir)/applications
--desktop_in_files = ghex.desktop.in
--desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-+#desktopdir = $(datadir)/applications
-+#desktop_in_files = ghex.desktop.in
-+#desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- 
--@INTLTOOL_DESKTOP_RULE@
-+##@INTLTOOL_DESKTOP_RULE@
- 
- #Install the ghex2 schema file
--if GCONF_SCHEMAS_INSTALL
--install-data-local:
--	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
--else
--install-data-local:
--endif
--
--CLEANFILES =			\
--	$(desktop_DATA)
-+#if GCONF_SCHEMAS_INSTALL
-+#install-data-local:
-+#	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
-+#else
-+#install-data-local:
-+#endif
-+
-+#CLEANFILES =			\
-+#	$(desktop_DATA)
- 
- DISTCLEANFILES =		\
- 	intltool-extract	\
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 28b460c..00c0b9b 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -13,13 +13,13 @@ BUILT_SOURCES = \
- 	ghex-marshal.c	\
- 	ghex-marshal.h
- 
--bin_PROGRAMS = ghex2
-+#bin_PROGRAMS = ghex2
- 
- lib_LTLIBRARIES = libgtkhex.la
- 
- libgtkhexdir = $(includedir)/gtkhex/
- 
--uidir = $(datadir)/gnome-2.0/ui/
-+#uidir = $(datadir)/gnome-2.0/ui/
- 
- libgtkhex_la_SOURCES = \
- 	hex-document.c			\
-@@ -41,15 +41,15 @@ libgtkhex_HEADERS = \
- 	hex-document.h 			\
- 	gtkhex.h
- 
--ghex2_SOURCES = \
--	hex-document-ui.c preferences.c findreplace.c converter.c	\
--	config.c main.c ui.c chartable.c session.c		\
--	print.c ghex-window.c ghex-window.h				\
--	gnome-print-font-dialog.c gnome-print-font-dialog.h		\
--	gnome-print-font-picker.c gnome-print-font-picker.h		\
--	factory.c factory.h hex-dialog.c hex-dialog.h			\
--	configuration.h preferences.h findreplace.h print.h		\
--	converter.h chartable.h ui.h session.h
-+#ghex2_SOURCES = \
-+#	hex-document-ui.c preferences.c findreplace.c converter.c	\
-+#	config.c main.c ui.c chartable.c session.c		\
-+#	print.c ghex-window.c ghex-window.h				\
-+#	gnome-print-font-dialog.c gnome-print-font-dialog.h		\
-+#	gnome-print-font-picker.c gnome-print-font-picker.h		\
-+#	factory.c factory.h hex-dialog.c hex-dialog.h			\
-+#	configuration.h preferences.h findreplace.h print.h		\
-+#	converter.h chartable.h ui.h session.h
- 
- ghex-marshal.h: ghex-marshal.list $(GLIB_GENMARSHAL)
- 	$(GLIB_GENMARSHAL) $< --header --prefix=ghex_marshal > $@
-@@ -57,11 +57,12 @@ ghex-marshal.c: ghex-marshal.list $(GLIB_GENMARSHAL)
- 	echo "#include \"ghex-marshal.h\"" > $@ && \
- 	$(GLIB_GENMARSHAL) $< --body --prefix=ghex_marshal >> $@
- 
--ui_DATA = ghex-ui.xml
-+#ui_DATA = ghex-ui.xml
- 
--EXTRA_DIST = \
--	$(ui_DATA)		\
--	ghex-marshal.list
-+#EXTRA_DIST = \
-+#	$(ui_DATA)		\
-+#	ghex-marshal.list
-+EXTRA_DIST = ghex-marshal.list
- 
- LDADD =	\
- 	$(POPT_LIBS)	\

diff --git a/app-editors/ghex/ghex-2.24.0-r200.ebuild b/app-editors/ghex/ghex-2.24.0-r200.ebuild
deleted file mode 100644
index a687296..0000000
--- a/app-editors/ghex/ghex-2.24.0-r200.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-2.24.0.ebuild,v 1.11 2011/01/24 13:12:44 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome hexadecimal editor library"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.13:2
-	dev-libs/popt
-	>=dev-libs/atk-1
-	gnome-base/gconf:2
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/libgnomeprintui-2.2"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2"
-# Most people who install ghex will be looking to get a hex editor program
-PDEPEND="app-editors/ghex:3"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF} --disable-static"
-}
-
-src_prepare() {
-	# build only the gtkhex library; the executable will be provided by ghex:3
-	epatch "${FILESDIR}/${P}-build-libgtkhex-only.patch"
-	eautoreconf
-	gnome2_src_prepare
-}

diff --git a/app-editors/ghex/ghex-3.0.0.ebuild b/app-editors/ghex/ghex-9999.ebuild
similarity index 65%
rename from app-editors/ghex/ghex-3.0.0.ebuild
rename to app-editors/ghex/ghex-9999.ebuild
index 84d501e..4632491 100644
--- a/app-editors/ghex/ghex-3.0.0.ebuild
+++ b/app-editors/ghex/ghex-9999.ebuild
@@ -1,30 +1,30 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-2.24.0.ebuild,v 1.11 2011/01/24 13:12:44 eva Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="Gnome hexadecimal editor"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 FDL-1.1"
-SLOT="3"
+SLOT="2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
-COMMON_DEPEND=">=dev-libs/glib-2.26:2
+RDEPEND=">=dev-libs/glib-2.26:2
 	>=x11-libs/gtk+-3.0:3
 	>=dev-libs/atk-1"
-# File collisions with gtk2-based program's icons etc.
-RDEPEND="${COMMON_DEPEND}
-	!<app-editors/ghex-2.24.0-r200:2"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.41.0
+	>=dev-util/intltool-0.41.1
 	>=app-text/gnome-doc-utils-0.9.0
 	>=sys-devel/gettext-0.17"