gnome-1.x removal

Package-Manager: portage-2.1.2_rc3-r9

7 files changed, 4 insertions, 243 deletions

diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index bf818dfa5e99..b7801b619393 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,50 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX gconf-1.0.9-gcc4.patch 581 RMD160 ee224b9ece8c06d41437eff7c86b799823aefe95 SHA1 7ac15c54fde61df4be390f7b15d1d4680a5c5780 SHA256 4e0a6cbc44d96c8a1dbd870b936f2beebc385856f8afd91cfb8084cd70d1320f
-MD5 a00775eca77339f117c1edd3ae41ed32 files/gconf-1.0.9-gcc4.patch 581
-RMD160 ee224b9ece8c06d41437eff7c86b799823aefe95 files/gconf-1.0.9-gcc4.patch 581
-SHA256 4e0a6cbc44d96c8a1dbd870b936f2beebc385856f8afd91cfb8084cd70d1320f files/gconf-1.0.9-gcc4.patch 581
-AUX gconf-1.0.9-linguas.patch 591 RMD160 682f64046fc5a72719315b8217aa21f5e8f05c74 SHA1 158d4d885ceebd39f5086a167df1d94c1b5443a3 SHA256 7179fe757fc47ca4022b4e6d6e411c28d4828b5749c13e4c18b04d63414a867d
-MD5 ea0fe5ad2e87dd94d776ce17c94e54c8 files/gconf-1.0.9-linguas.patch 591
-RMD160 682f64046fc5a72719315b8217aa21f5e8f05c74 files/gconf-1.0.9-linguas.patch 591
-SHA256 7179fe757fc47ca4022b4e6d6e411c28d4828b5749c13e4c18b04d63414a867d files/gconf-1.0.9-linguas.patch 591
-AUX gconf-1.0.9-locallock_mdk.patch 1202 RMD160 5b9129acba9fbaef871830d0ff5378398d02393c SHA1 7a32803875f68199f6523af609a4de110dac1170 SHA256 98021a78c16f3f21a33c8705907cdfb485a11df1a4acddbd5dfbf40b0738ce23
-MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
-RMD160 5b9129acba9fbaef871830d0ff5378398d02393c files/gconf-1.0.9-locallock_mdk.patch 1202
-SHA256 98021a78c16f3f21a33c8705907cdfb485a11df1a4acddbd5dfbf40b0738ce23 files/gconf-1.0.9-locallock_mdk.patch 1202
-AUX gconfd-2-fix.patch 1820 RMD160 126c30484309dc60a72b843697ab0feb352cde67 SHA1 3aaba931f36cbffe6a66e4f0538e19ef41fb8176 SHA256 d311a969cfcfda29a1350c47b8a60068d4da37651a4485521b6889400ad584c4
-MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
-RMD160 126c30484309dc60a72b843697ab0feb352cde67 files/gconfd-2-fix.patch 1820
-SHA256 d311a969cfcfda29a1350c47b8a60068d4da37651a4485521b6889400ad584c4 files/gconfd-2-fix.patch 1820
-DIST GConf-1.0.9.tar.bz2 784363 RMD160 d5cb8ae92146c33bc6ea073b485c3ad6f12f6cc7 SHA256 863c3dd3e72cf7d35eff7497b833978cc28a9f9d12d7caeb9d61ea785731cb19
 DIST GConf-2.14.0.tar.bz2 1895477 RMD160 4e281fc8046238df2056cbb1c1b068dc9663041b SHA1 97784779cbecb1f52e1728647889dd4b48f04f62 SHA256 040c512ebc39285bce78c177e9e434e7b6731fd53a001768ee3405a919837525
-EBUILD gconf-1.0.9.ebuild 1890 RMD160 e4cf46cb942fdaf511a793c2601b44e3c8b74ab3 SHA1 89c99e14a977cdd0fc99af8d45c4a96159611795 SHA256 6454e7ac366d3f5980073319c7a009aef26a917dadf941c879d934bd3e829fd9
-MD5 a8cdd6bb8a7c6ab1e5cdf6a5cb334ccb gconf-1.0.9.ebuild 1890
-RMD160 e4cf46cb942fdaf511a793c2601b44e3c8b74ab3 gconf-1.0.9.ebuild 1890
-SHA256 6454e7ac366d3f5980073319c7a009aef26a917dadf941c879d934bd3e829fd9 gconf-1.0.9.ebuild 1890
 EBUILD gconf-2.14.0.ebuild 1933 RMD160 cb930e6a12c13472094b9b732da349912edb10b1 SHA1 d420c596a5b1d203c2c125c0cae091d4bf076331 SHA256 f9eb52765cc92f997678d014c07e800a6d273f5ef94b5be276007ca82f8355af
 MD5 b050d092f779acb5d18b8f6aaeb2aa6a gconf-2.14.0.ebuild 1933
 RMD160 cb930e6a12c13472094b9b732da349912edb10b1 gconf-2.14.0.ebuild 1933
 SHA256 f9eb52765cc92f997678d014c07e800a6d273f5ef94b5be276007ca82f8355af gconf-2.14.0.ebuild 1933
-MISC ChangeLog 20712 RMD160 30f774d525155d75ae90fb6ae4b7e3e9d630fea1 SHA1 aecdf8290a3ecc8eb0a09a5719030e1134e8ec2c SHA256 ffd8e51f64d03e4ba8519d316216e7a22c43ade450619ad5c9d648fdaa0f1528
-MD5 ecd2ceb8eaf5d075501d913b2b8db9b7 ChangeLog 20712
-RMD160 30f774d525155d75ae90fb6ae4b7e3e9d630fea1 ChangeLog 20712
-SHA256 ffd8e51f64d03e4ba8519d316216e7a22c43ade450619ad5c9d648fdaa0f1528 ChangeLog 20712
+MISC ChangeLog 20952 RMD160 0403fb0208dd146c440201d86be2f375160a651d SHA1 6b9960da8b44371ee0272cc9cc4dd911c3f9da8e SHA256 2eb5171a739cba99151b1dcb4f15aa94e8fba243f6eb66260c87c1b05312aaa0
+MD5 50a832a272f9c402318687cd9ece6d3e ChangeLog 20952
+RMD160 0403fb0208dd146c440201d86be2f375160a651d ChangeLog 20952
+SHA256 2eb5171a739cba99151b1dcb4f15aa94e8fba243f6eb66260c87c1b05312aaa0 ChangeLog 20952
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 b7e93a52522be76daa1603400d61ba52 files/digest-gconf-1.0.9 238
-RMD160 e9beb9df147ffd6f8d50649b4ee4cc6228a38c0a files/digest-gconf-1.0.9 238
-SHA256 65e197a6a7288d97cdbb02678e21562fff201c70d528bdfe2074641896acf45f files/digest-gconf-1.0.9 238
 MD5 5dc9e65c9149f6afd374d60c243b8577 files/digest-gconf-2.14.0 244
 RMD160 dc7bbd4d128938abcc1caae0f4e66d1f140604bf files/digest-gconf-2.14.0 244
 SHA256 732b6991d53f6e4f74136993463746c114f2881e198c38ee914f259dbba0ae52 files/digest-gconf-2.14.0 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFYRDEkeYb6olFHJcRAoeRAJ9M3Id3rSZfd1llxOpIJ8POm36oxgCfe3iI
-eFSkUbdW9D+Qo2cZSK/kj4s=
-=pLwM
------END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/files/digest-gconf-1.0.9 b/gnome-base/gconf/files/digest-gconf-1.0.9
deleted file mode 100644
index 6c04b3831cc6..000000000000
--- a/gnome-base/gconf/files/digest-gconf-1.0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 613aea1d9b7a9c504f52217451c7bf99 GConf-1.0.9.tar.bz2 784363
-RMD160 d5cb8ae92146c33bc6ea073b485c3ad6f12f6cc7 GConf-1.0.9.tar.bz2 784363
-SHA256 863c3dd3e72cf7d35eff7497b833978cc28a9f9d12d7caeb9d61ea785731cb19 GConf-1.0.9.tar.bz2 784363
diff --git a/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch b/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch
deleted file mode 100644
index 0d02cb359ef1..000000000000
--- a/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-These functions are declared external in a header file, then defined with
-static, the mismatch is an error with gcc4
-
---- GConf-1.0.9/backends/bdb.c.agriffis	2006-02-21 08:55:42.000000000 -0500
-+++ GConf-1.0.9/backends/bdb.c	2006-02-21 08:55:51.000000000 -0500
-@@ -331,7 +331,7 @@
- 
- /* } */
- 
--static guint32
-+guint32
- get_dir_id (BDB_Store * bdb, const char *dir)
- {
-   int ret;
-@@ -405,7 +405,7 @@
- 
- /* { Functions to create directories and maintain the dir hierarchy */
- 
--static guint32
-+guint32
- get_or_create_dir (BDB_Store * bdb, const char *dir)
- {
-   guint32 parent_id;
diff --git a/gnome-base/gconf/files/gconf-1.0.9-linguas.patch b/gnome-base/gconf/files/gconf-1.0.9-linguas.patch
deleted file mode 100644
index 9f28a1dc613a..000000000000
--- a/gnome-base/gconf/files/gconf-1.0.9-linguas.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix bug 114805: gnome-base/gconf-1.0.9 fails to compile if LINGUAS contains zh
-
-diff -ruN GConf-1.0.9.orig/configure GConf-1.0.9/configure
---- GConf-1.0.9.orig/configure	2005-12-07 14:50:19.000000000 -0800
-+++ GConf-1.0.9/configure	2005-12-07 14:51:26.000000000 -0800
-@@ -10475,7 +10475,7 @@
-        NEW_LINGUAS=
-        for lang in ${LINGUAS=$ALL_LINGUAS}; do
-          case "$ALL_LINGUAS" in
--          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-+          $lang|*\ $lang|$lang\ *|*\ $lang\ *) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-          esac
-        done
-        LINGUAS=$NEW_LINGUAS
diff --git a/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch b/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch
deleted file mode 100644
index 71dae2a61acf..000000000000
--- a/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- GConf-1.0.9/gconf/gconf-internals.c.locallock	2003-10-15 14:47:31.000000000 +0200
-+++ GConf-1.0.9/gconf/gconf-internals.c	2003-10-28 15:40:15.000000000 +0100
-@@ -2957,10 +2957,53 @@
-     }
- }
- 
-+enum { UNKNOWN, LOCAL, NORMAL };
-+
-+
-+static gboolean
-+gconf_use_local_locks (void)
-+{
-+  static int local_locks = UNKNOWN;
-+   
-+  if (local_locks == UNKNOWN)
-+    {
-+      const char *l =
-+        g_getenv ("GCONF_GLOBAL_LOCKS");
-+ 
-+      if (l && atoi (l) == 1)
-+        local_locks = NORMAL;
-+      else
-+        local_locks = LOCAL;
-+    }
-+ 
-+  return local_locks == LOCAL;
-+}
-+
- char*
- gconf_get_daemon_dir (void)
- {
--  return g_strconcat (g_get_home_dir (), "/.gconfd", NULL);
-+  if (gconf_use_local_locks ())
-+    {
-+      char *s;
-+      char *subdir;
-+      char *tmpdir;
-+  
-+      subdir = g_strconcat ("gconfd-", g_get_user_name (), NULL);
-+        
-+      if (g_getenv ("GCONF_TMPDIR")) {
-+       tmpdir = g_getenv ("GCONF_TMPDIR");
-+      } else {
-+       tmpdir = g_get_tmp_dir ();
-+      }
-+
-+      s = g_strconcat (tmpdir,"/", subdir, NULL);
-+      
-+      g_free (subdir);
-+  
-+      return s;
-+  }
-+  else
-+    return g_strconcat (g_get_home_dir (), "/.gconfd", NULL);
- }
- 
- char*
diff --git a/gnome-base/gconf/files/gconfd-2-fix.patch b/gnome-base/gconf/files/gconfd-2-fix.patch
deleted file mode 100644
index 71b753006fb5..000000000000
--- a/gnome-base/gconf/files/gconfd-2-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urw GConf-1.0.8.orig/gconf/gconf-internals.c GConf-1.0.8/gconf/gconf-internals.c
---- GConf-1.0.8.orig/gconf/gconf-internals.c	2002-01-23 20:42:06.000000000 +0100
-+++ GConf-1.0.8/gconf/gconf-internals.c	2003-06-20 02:14:49.000000000 +0200
-@@ -3038,7 +3038,9 @@
-           goto out;
-         }
- 
--      if (gconf_file_exists (GCONF_BINDIR"/gconfd-2"))
-+      if (gconf_file_exists (GCONF_LIBEXECDIR"/gconfd-2"))
-+        argv[0] = g_strconcat (GCONF_LIBEXECDIR, "/gconfd-2", NULL);
-+			else if (gconf_file_exists (GCONF_BINDIR"/gconfd-2"))
-         argv[0] = g_strconcat (GCONF_BINDIR, "/gconfd-2", NULL);
-       else
-         argv[0] = g_strconcat (GCONF_BINDIR, "/" GCONFD, NULL);
-diff -urw GConf-1.0.8.orig/gconf/Makefile.am GConf-1.0.8/gconf/Makefile.am
---- GConf-1.0.8.orig/gconf/Makefile.am	2001-09-27 20:09:49.000000000 +0200
-+++ GConf-1.0.8/gconf/Makefile.am	2003-06-20 02:14:49.000000000 +0200
-@@ -16,6 +16,7 @@
- 	-DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\"			\
- 	-DGCONF_BUILDDIR=\""$(top_builddir)"\"				\
- 	-DGCONF_BINDIR=\""$(bindir)"\"					\
-+	-DGCONF_LIBEXECDIR=\""$(libexecdir)"\"                          \
- 	-DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\"		\
- 	-DVERSION=\""$(VERSION)"\"					\
- 	-DIID=\""OAFIID:gconfd:19991118"\"				\
-diff -urw GConf-1.0.8.orig/gconf/Makefile.in GConf-1.0.8/gconf/Makefile.in
---- GConf-1.0.8.orig/gconf/Makefile.in	2002-02-05 00:37:13.000000000 +0100
-+++ GConf-1.0.8/gconf/Makefile.in	2003-06-20 02:16:37.000000000 +0200
-@@ -161,6 +161,7 @@
- 	-DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\"			\
- 	-DGCONF_BUILDDIR=\""$(top_builddir)"\"				\
- 	-DGCONF_BINDIR=\""$(bindir)"\"					\
-+	-DGCONF_LIBEXECDIR=\""$(libexecdir)"\"					\
- 	-DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\"		\
- 	-DVERSION=\""$(VERSION)"\"					\
- 	-DIID=\""OAFIID:gconfd:19991118"\"				\
diff --git a/gnome-base/gconf/gconf-1.0.9.ebuild b/gnome-base/gconf/gconf-1.0.9.ebuild
deleted file mode 100644
index cd60068c68f6..000000000000
--- a/gnome-base/gconf/gconf-1.0.9.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.9.ebuild,v 1.24 2006/09/05 01:58:52 kumba Exp $
-
-inherit libtool gnome.org eutils gnuconfig
-
-MY_PN=GConf
-MY_P=${MY_PN}-${PV}
-PVP=(${PV//[-\._]/ })
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Gnome Configuration System and Daemon"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="nls"
-
-DEPEND="dev-util/indent
-	=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
-	dev-libs/libxml
-	dev-libs/popt
-	gnome-base/oaf
-	=gnome-base/orbit-0*
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gconfd-2-fix.patch
-	epatch ${FILESDIR}/${P}-locallock_mdk.patch
-	epatch ${FILESDIR}/${P}-gcc4.patch
-	epatch ${FILESDIR}/${P}-linguas.patch
-
-	mkdir ${S}/intl
-	touch ${S}/intl/libgettext.h
-
-	elibtoolize
-	gnuconfig_update
-}
-
-src_compile() {
-	econf $(use_enable nls) || die "econf failed"
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-
-	# gconf 1.0.8 seems to gets the perms wrong on this dir.
-	chmod 0755 ${D}/etc/gconf/gconf.xml.mandatory
-	# keep this mandatory dir
-	keepdir /etc/gconf/gconf.xml.mandatory/.keep${SLOT}
-	# this fix closes bug #803
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-}
-
-pkg_postinst() {
-	# this is to fix installations where the following dir
-	# has already been merged with incorrect permissions.
-	# We can remove this fix after gconf 1.0.8 is an ancient
-	# version.
-	if [ ! -e ${ROOT}/etc/gconf/gconf.xml.mandatory ]
-	then
-		#unmerge of older revisions nuke this one
-		mkdir -p ${ROOT}/etc/gconf/gconf.xml.mandatory
-	fi
-	chmod 0755 ${ROOT}/etc/gconf/gconf.xml.mandatory
-}