ebuild modifications and cleanup of old versions. fixes #68328, #72192

(Portage version: 2.0.51.19)

10 files changed, 75 insertions, 382 deletions

diff --git a/dev-util/screem/ChangeLog b/dev-util/screem/ChangeLog
index a5ff040c015c..9f9a7cb7a996 100644
--- a/dev-util/screem/ChangeLog
+++ b/dev-util/screem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/screem
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/screem/ChangeLog,v 1.6 2005/01/08 22:41:46 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/screem/ChangeLog,v 1.7 2005/06/25 00:43:04 allanonjl Exp $
+
+*screem-0.14.1 (25 Jun 2005)
+
+  25 Jun 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -files/screem-0.10.2-eggtoolbar.patch, -files/Makefile.in,
+  -screem-0.4.1-r2.ebuild, -screem-0.10.2-r1.ebuild, +screem-0.14.1.ebuild:
+  ebuild modifications and cleanup of old versions.  fixes #68328, #72192
 
   08 Jan 2005; foser <foser@gentoo.org> screem-0.10.2-r1.ebuild :
   Fix croco dep (#77164)
diff --git a/dev-util/screem/Manifest b/dev-util/screem/Manifest
index f37c56e2414a..ed3d82d303b6 100644
--- a/dev-util/screem/Manifest
+++ b/dev-util/screem/Manifest
@@ -1,13 +1,9 @@
 MD5 4e15d93b6faf17410186cdd2d9b290c2 screem-0.6.2.ebuild 1549
-MD5 6615ff57711f87f404dadcec64d2863e screem-0.4.1-r2.ebuild 1933
-MD5 3af9611ce40867f4129d4ab1ad1476b0 ChangeLog 3975
+MD5 ab199b119474ac018bc0ddb0b8f7f4a1 screem-0.14.1.ebuild 1754
+MD5 e872e7fce0b02c65427c2f007da91ab3 ChangeLog 4273
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 0cd97e07c797783694af6555ee47410f screem-0.8.1.ebuild 1391
-MD5 78cc9a3502a1f4e2f3911561c93ddc72 screem-0.10.2-r1.ebuild 1535
 MD5 3beed928c0c988ad2b67a66d15754376 files/digest-screem-0.6.2 65
 MD5 d10ea61a9667f79982676c70cc75be58 files/digest-screem-0.8.1 65
+MD5 4e2b35b70de87b84dacf6372075db046 files/digest-screem-0.14.1 66
 MD5 76c7e22a917deca493bb0f34bd7db6c1 files/screem-0.8.1-makefile-fix.patch 546
-MD5 910ae14270c4e3e0629cda3cbf869405 files/Makefile.in 6577
-MD5 c0014bc2b1634015fdf4186f2d5311f2 files/digest-screem-0.4.1-r2 65
-MD5 577877e1ca757290a226d3e5bb49bf8b files/screem-0.10.2-eggtoolbar.patch 677
-MD5 faff09ded66a28c95b0c285b5ad8322f files/digest-screem-0.10.2-r1 66
diff --git a/dev-util/screem/files/Makefile.in b/dev-util/screem/files/Makefile.in
deleted file mode 100644
index 3f14c13c296a..000000000000
--- a/dev-util/screem/files/Makefile.in
+++ /dev/null
@@ -1,216 +0,0 @@
-# Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-transform = @program_transform_name@
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
-datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(datadir)/gettext/intl
-aliaspath = $(localedir):.
-subdir = intl
-
-DESTDIR =
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-
-l = @l@
-
-AR = ar
-CC = @CC@
-LIBTOOL = @LIBTOOL@
-RANLIB = @RANLIB@
-
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
--DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-HEADERS = $(COMHDRS) libgettext.h loadinfo.h
-COMHDRS = gettext.h gettextP.h hash-string.h
-SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
-COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
-finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c
-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo
-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
-GETTOBJS = intl-compat.$lo
-DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
-xopen-msg.sed $(HEADERS) $(SOURCES)
-DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc intlh.inst.in
-
-.SUFFIXES:
-.SUFFIXES: .c .o .lo
-.c.o:
-	$(COMPILE) $<
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) $<
-
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
-
-all: all-@USE_INCLUDED_LIBINTL@
-
-all-yes: libintl.$la intlh.inst
-all-no:
-
-libintl.a: $(OBJECTS)
-	rm -f $@
-	$(AR) cru $@ $(OBJECTS)
-	$(RANLIB) $@
-
-libintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
-		   -version-info 1:0 -rpath $(libdir)
-
-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
-	cd ../po && $(MAKE) cat-id-tbl.$lo
-
-check: all
-
-# This installation goal is only used in GNU gettext.  Packages which
-# only use the library should use install instead.
-
-# We must not install the libintl.h/libintl.a files if we are on a
-# system which has the gettext() function in its C library or in a
-# separate library or use the catgets interface.  A special case is
-# where configure found a previously installed GNU gettext library.
-# If you want to use the one which comes with this version of the
-# package, you have to use `configure --with-included-gettext'.
-install: install-exec install-data
-install-exec: all
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	  fi; \
-	  $(INSTALL_DATA) intlh.inst $(DESTDIR)$(includedir)/libintl.h; \
-	  $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \
-	else \
-	  : ; \
-	fi
-install-data: all
-	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-	  dists="$(DISTFILES.common)"; \
-	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	dists="$(DISTFILES.common)"; \
-	for file in $$dists; do \
-	  rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	done
-
-info dvi:
-
-$(OBJECTS): ../config.h libgettext.h
-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
-
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
-
-id: ID
-
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
-
-
-mostlyclean:
-	rm -f *.a *.o *.lo core core.*
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile ID TAGS po2msg.sed po2tbl.sed
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-
-# GNU gettext needs not contain the file `VERSION' but contains some
-# other files which should not be distributed in other packages.
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile $(DISTFILES)
-	if test "$(PACKAGE)" = gettext; then \
-	  additional="$(DISTFILES.gettext)"; \
-	else \
-	  additional="$(DISTFILES.normal)"; \
-	fi; \
-	for file in $(DISTFILES.common) $$additional; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
-	done
-
-dist-libc:
-	tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
-
-Makefile: Makefile.in ../config.status
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-# The dependency for intlh.inst is different in gettext and all other
-# packages.  Because we cannot you GNU make features we have to solve
-# the problem while rewriting Makefile.in.
-@GT_YES@intlh.inst: intlh.inst.in ../config.status
-@GT_YES@	cd .. \
-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-@GT_YES@	  $(SHELL) ./config.status
-@GT_NO@.PHONY: intlh.inst
-@GT_NO@intlh.inst:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dev-util/screem/files/digest-screem-0.10.2-r1 b/dev-util/screem/files/digest-screem-0.10.2-r1
deleted file mode 100644
index 13012fff0636..000000000000
--- a/dev-util/screem/files/digest-screem-0.10.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a58c72555a6cecf34c2e2f6d9fda0288 screem-0.10.2.tar.gz 2350572
diff --git a/dev-util/screem/files/digest-screem-0.14.1 b/dev-util/screem/files/digest-screem-0.14.1
new file mode 100644
index 000000000000..bddbb361529a
--- /dev/null
+++ b/dev-util/screem/files/digest-screem-0.14.1
@@ -0,0 +1 @@
+MD5 b23bf53698df79477f83f3d66b6eab0d screem-0.14.1.tar.gz 3947396
diff --git a/dev-util/screem/files/digest-screem-0.4.1-r2 b/dev-util/screem/files/digest-screem-0.4.1-r2
deleted file mode 100644
index 68e2c59a402e..000000000000
--- a/dev-util/screem/files/digest-screem-0.4.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8424eb59a232e976f9dd276320727f5b screem-0.4.1.tar.gz 2398925
diff --git a/dev-util/screem/files/screem-0.10.2-eggtoolbar.patch b/dev-util/screem/files/screem-0.10.2-eggtoolbar.patch
deleted file mode 100644
index 71037522a706..000000000000
--- a/dev-util/screem/files/screem-0.10.2-eggtoolbar.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- eggtoolbar.c.old	2004-10-17 23:06:35.114101728 +0100
-+++ eggtoolbar.c	2004-10-17 23:06:57.778656192 +0100
-@@ -2534,7 +2534,7 @@
- 
- GtkWidget*
- egg_toolbar_append_element (EggToolbar          *toolbar,
--			    GtkToolbarChildType  type,
-+			    EggToolbarChildType  type,
- 			    GtkWidget           *widget,
- 			    const char          *text,
- 			    const char          *tooltip_text,
-@@ -2551,7 +2551,7 @@
- 
- GtkWidget *
- egg_toolbar_prepend_element (EggToolbar          *toolbar,
--			     GtkToolbarChildType  type,
-+			     EggToolbarChildType  type,
- 			     GtkWidget           *widget,
- 			     const char          *text,
- 			     const char          *tooltip_text,
diff --git a/dev-util/screem/screem-0.10.2-r1.ebuild b/dev-util/screem/screem-0.10.2-r1.ebuild
deleted file mode 100644
index 508cba8e673c..000000000000
--- a/dev-util/screem/screem-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/screem/screem-0.10.2-r1.ebuild,v 1.4 2005/01/08 22:41:46 foser Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="SCREEM (Site CReating and Editing EnvironmenMent) is an
-integrated environment of the creation and maintenance of websites and
-pages"
-SRC_URI="mirror://sourceforge/screem/${P}.tar.gz"
-HOMEPAGE="http://www.screem.org"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="ssl zlib"
-
-RDEPEND=">=gnome-base/libgnome-2.2.0
-	>=gnome-base/libgnomeui-2.2.0
-	>=dev-libs/libxml2-2.4.3
-	>=gnome-base/libglade-2.0.0
-	>=gnome-base/gconf-2.2.0
-	>=gnome-base/gnome-vfs-2.2.0
-	>=x11-libs/gtk+-2.2
-	>=dev-libs/glib-2.2
-	>=gnome-base/libbonobo-2.2.0
-	>=gnome-base/libbonoboui-2.2.0
-	=gnome-extra/libgtkhtml-2*
-	>=gnome-base/libgnomeprint-2.2.0
-	>=gnome-base/libgnomeprintui-2.2.0
-	>=x11-libs/gtksourceview-0.3.0
-	=dev-libs/libcroco-0.5*
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig"
-
-
-use ssl && G2CONF="$G2CONF --with-ssl"
-use zlib || G2CONF="$G2CONF --without-zlib"
-
-DOCS="ABOUT-NLS AUTHORS BUGS ChangeLog INSTALL NEWS README TODO"
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e 's:@pixmapsdir@:${prefix}/share/screem/pixmaps:g' \
-		${S}/pixmaps/Makefile.in
-
-	cd ${S}/libegg/toolbar
-	epatch ${FILESDIR}/${P}-eggtoolbar.patch
-}
-
-src_compile() {
-	gnome2_src_configure
-	emake  || die "make failed"
-}
-
diff --git a/dev-util/screem/screem-0.14.1.ebuild b/dev-util/screem/screem-0.14.1.ebuild
new file mode 100644
index 000000000000..ae1f78567837
--- /dev/null
+++ b/dev-util/screem/screem-0.14.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/screem/screem-0.14.1.ebuild,v 1.1 2005/06/25 00:43:04 allanonjl Exp $
+
+inherit gnome2
+
+DESCRIPTION="SCREEM (Site CReating and Editing EnvironmenMent) is an
+integrated environment of the creation and maintenance of websites and
+pages"
+HOMEPAGE="http://www.screem.org/"
+SRC_URI="mirror://sourceforge/screem/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE="doc ssl zlib dbus"
+
+RDEPEND=">=dev-libs/glib-2.5.6
+	>=x11-libs/gtk+-2.6
+	>=dev-libs/libxml2-2.4.3
+	>=gnome-base/libglade-2.3
+	>=gnome-base/gconf-2.2
+	>=gnome-base/gnome-vfs-2.8.3
+	media-libs/gdk-pixbuf
+	>=gnome-base/libgnome-2.2
+	>=gnome-base/libgnomeui-2.6
+	=gnome-extra/libgtkhtml-2*
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2
+	>=x11-libs/gtksourceview-1.1.90
+	>=dev-libs/libcroco-0.6.0
+	dbus? ( >=sys-apps/dbus-0.22 )
+	ssl? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.1.1
+	>=dev-util/intltool-0.29
+	dev-util/pkgconfig
+	>=x11-misc/shared-mime-info-0.14"
+
+G2CONF="${G2CONF} --disable-update-mime --disable-update-desktop \
+	--disable-schemas-install $(use_with ssl) $(use_with zlib) \
+	$(use_enable dbus)"
+
+DOCS="ABOUT-NLS AUTHORS BUGS COPYING COPYING-DOCS ChangeLog INSTALL NEWS README TODO"
+
+src_install() {
+	# fix scrollkeeper 
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+}
+
+pkg_postinst() {
+	echo
+	einfo "You must logout of your current gnome session and relogin."
+	einfo "This is due to the fact that screem needs gconf to be"
+	einfo "restarted and that is the easiest way. "
+	einfo "If you do not, you will get an error about screem not"
+	einfo "being able to find a required file."
+	echo
+}
+
+USE_DESTDIR="1"
diff --git a/dev-util/screem/screem-0.4.1-r2.ebuild b/dev-util/screem/screem-0.4.1-r2.ebuild
deleted file mode 100644
index ab9e3011b2a0..000000000000
--- a/dev-util/screem/screem-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/screem/screem-0.4.1-r2.ebuild,v 1.1 2004/08/15 17:32:52 stuart Exp $
-
-IUSE="gtkhtml ssl nls"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="SCREEM (Site CReating and Editing EnvironmenMent) is an
-integrated environment of the creation and maintenance of websites and
-pages"
-SRC_URI="http://ftp1.sourceforge.net/screem/${P}.tar.gz"
-HOMEPAGE="http://www.screem.org"
-KEYWORDS="x86 sparc"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	>=dev-libs/libxml-1.8.15
-	>=media-libs/gdk-pixbuf-0.11.0-r1
-	<gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	ssl? ( dev-libs/openssl )
-	gtkhtml? ( >=gnome-extra/gtkhtml-0.14.0-r1 )
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	libtoolize --copy --force
-
-	local myopts=""
-	if ! use nls
-	then
-		myopts="--disable-nls"
-	fi
-	if use ssl
-	then
-		myopts="$myopts --with-ssl"
-	fi
-
-	cp ${FILESDIR}/Makefile.in intl/Makefile.in
-
-	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags` "
-	CFLAGS="${CFLAGS} `gnome-config --cflags libglade`"
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --sysconfdir=/etc \
-		    --localstatedir=/var/lib \
-		    --with-gnomevfs \
-		    ${myopts} || die
-
-	if use ssl
-	then
-		cd ${S}/plugins/uploadWizard
-		cp Makefile Makefile.orig
-		sed -e "s:uploadWizard_la_LIBADD =:uploadWizard_la_LIBADD = -lssl:" \
-			-e "s:uploadWizard_la_DEPENDENCIES =:uploadWizard_la_DEPENDENCIES = -lssl:" \
-			Makefile.orig > Makefile
-		cd ${S}
-	fi
-
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib \
-		 Applicationsdir=${D}/usr/share/gnome/apps/Development \
-		 gnewdir=${D}/usr/share/mc/templates \
-		 Mimedir=${D}/usr/share/mime-info \
-	     install || die
-
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog DEPENDS FAQ INSTALL
-	dodoc NEWS README TODO
-}
-