Clean up old revisions.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 6 insertions, 405 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index ab150de666be..7b4ccf748891 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.227 2010/05/22 16:19:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.228 2010/05/31 21:22:30 eva Exp $
+
+  31 May 2010; Gilles Dartiguelongue <eva@gentoo.org> -gconf-2.24.0.ebuild,
+  -files/gconf-2.24.0-automagic-ldap.patch, -gconf-2.28.0.ebuild,
+  -gconf-2.28.0-r1.ebuild:
+  Clean up old revisions.
 
   22 May 2010; Raúl Porcel <armin76@gentoo.org> gconf-2.28.0.ebuild,
   gconf-2.28.0-r1.ebuild, gconf-2.28.1.ebuild:
diff --git a/gnome-base/gconf/files/gconf-2.24.0-automagic-ldap.patch b/gnome-base/gconf/files/gconf-2.24.0-automagic-ldap.patch
deleted file mode 100644
index 678c5fb58832..000000000000
--- a/gnome-base/gconf/files/gconf-2.24.0-automagic-ldap.patch
+++ /dev/null
@@ -1,90 +0,0 @@
----
- * make openldap support optional and auto-detected
-
- configure.in |   65 +++++++++++++++++++++++++++++++++++++++--------------------
- 1 file changed, 43 insertions(+), 22 deletions(-)
-
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -207,36 +207,57 @@ AC_CHECK_HEADERS(syslog.h sys/wait.h)
- 
- AC_CHECK_FUNCS(getuid sigaction fsync fchmod fdwalk)
- 
-+dnl **************************************************
-+dnl LDAP support.
-+dnl **************************************************
-+
-+AC_ARG_WITH(openldap,
-+  AS_HELP_STRING([--with-openldap],
-+    [Enable LDAP backend @<:@default=auto@:>@]),
-+  ,with_openldap=auto)
- 
- LDAP_LIBS=
--AC_CHECK_HEADER(ldap.h, [
-+
-+if test "x$with_openldap" != "xno"; then
-+  AC_CHECK_HEADER(ldap.h, [
-     AC_CHECK_LIB(ldap, ldap_init, AC_CHECK_LIB(lber, ber_free, [LDAP_LIBS="-lldap -llber"]))
-   ])
--AC_SUBST(LDAP_LIBS)
--AM_CONDITIONAL(LDAP_SUPPORT, test -n "$LDAP_LIBS")
- 
--dnl **************************************************
--dnl LDAP support.
--dnl **************************************************
--if test "$os_win32" != yes; then
-+  if test "x$os_win32" != "xyes"; then
-+    SAVE_CFLAGS="$CFLAGS"
-+    SAVE_LIBS="$LIBS"
-+    LDAP_CFLAGS="-DLDAP_DEPRECATED"
-+    CFLAGS="$CFLAGS $LDAP_CFLAGS"
-+    LIBS="$LIBS $LDAP_LIBS"
-+    AC_CHECK_FUNCS(ldap_ntlm_bind)
-+    CFLAGS="$SAVE_CFLAGS"
-+    LIBS="$SAVE_LIBS"
-+
-+  else # Win32
-+    LDAP_CFLAGS="-DLDAP_DEPRECATED"
-+    LDAP_LIBS="-lwldap32"
-+    AC_SUBST(LDAP_CFLAGS)
-+    AC_SUBST(LDAP_LIBS)
-+    AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
-+    msg_ldap="yes"
-+
-+  fi # Win32
-+
-+  if test -z "$LDAP_LIBS"; then
-+    if test "x$with_openldap" = "xyes"; then
-+      AC_MSG_ERROR([*** LDAP support explicitely requested but not found ***])
-+    else
-+      AC_MSG_WARN([*** LDAP support not found ***])
-+    fi
-+  fi
- 
--SAVE_CFLAGS="$CFLAGS"
--SAVE_LIBS="$LIBS"
--LDAP_CFLAGS="-DLDAP_DEPRECATED"
--CFLAGS="$CFLAGS $LDAP_CFLAGS"
--LIBS="$LIBS $LDAP_LIBS"
--AC_CHECK_FUNCS(ldap_ntlm_bind)
--CFLAGS="$SAVE_CFLAGS"
--LIBS="$SAVE_LIBS"
--
--else # Win32
--LDAP_CFLAGS="-DLDAP_DEPRECATED"
--LDAP_LIBS="-lwldap32"
-+  have_ldap=yes
-+else
-+  have_ldap=no
-+fi
- AC_SUBST(LDAP_CFLAGS)
- AC_SUBST(LDAP_LIBS)
--AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
--msg_ldap="yes"
--fi # Win32
-+AM_CONDITIONAL(LDAP_SUPPORT, [test -n "$LDAP_LIBS"])
- 
- IT_PROG_INTLTOOL([0.35.0])
- 
diff --git a/gnome-base/gconf/gconf-2.24.0.ebuild b/gnome-base/gconf/gconf-2.24.0.ebuild
deleted file mode 100644
index f48e9e1adba4..000000000000
--- a/gnome-base/gconf/gconf-2.24.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.24.0.ebuild,v 1.11 2009/05/01 11:39:25 eva Exp $
-
-inherit autotools eutils gnome2
-
-MY_PN=GConf
-MY_P=${MY_PN}-${PV}
-PVP=(${PV//[-\._]/ })
-
-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"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc ldap"
-
-# FIXME: add policykit support
-RDEPEND=">=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.8.16
-	>=dev-libs/dbus-glib-0.74
-	>=sys-apps/dbus-1
-	>=gnome-base/orbit-2.4
-	>=dev-libs/libxml2-2
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-gtk
-		--disable-defaults-service
-		$(use_enable debug)
-		$(use_with ldap openldap)"
-	#$(use_enable policykit defaults-service)
-	kill_gconf
-
-	# Need host's IDL compiler for cross or native build, bug #262747
-	export EXTRA_EMAKE="${EXTRA_EMAKE} ORBIT_IDL=/usr/bin/orbit-idl-2"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fix bug #193442, GNOME bug #498934
-	epatch "${FILESDIR}/${P}-automagic-ldap.patch"
-
-	# fix bug #238276
-	epatch "${FILESDIR}/${P}-no-gconfd.patch"
-
-	eautoreconf
-}
-
-# Can't run tests, missing script.
-#src_test() {
-#	emake -C tests || die "make tests failed"
-#	sh "${S}"/tests/runtests.sh || die "running tests failed"
-#}
-
-src_install() {
-	gnome2_src_install
-
-	keepdir /etc/gconf/gconf.xml.mandatory
-	keepdir /etc/gconf/gconf.xml.defaults
-
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
-	doenvd 50gconf || die "doenv failed"
-	dodir /root/.gconfd
-}
-
-pkg_preinst() {
-	kill_gconf
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	#change the permissions to avoid some gconf bugs
-	einfo "changing permissions for gconf dirs"
-	find  /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
-	einfo "changing permissions for gconf files"
-	find  /etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-}
-
-kill_gconf() {
-	# This function will kill all running gconfd-2 that could be causing troubles
-	if [ -x /usr/bin/gconftool-2 ]
-	then
-		/usr/bin/gconftool-2 --shutdown
-	fi
-
-	return 0
-}
diff --git a/gnome-base/gconf/gconf-2.28.0-r1.ebuild b/gnome-base/gconf/gconf-2.28.0-r1.ebuild
deleted file mode 100644
index 06eb2b4ade86..000000000000
--- a/gnome-base/gconf/gconf-2.28.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.28.0-r1.ebuild,v 1.4 2010/05/22 16:19:45 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils gnome2
-
-MY_PN=GConf
-MY_P=${MY_PN}-${PV}
-PVP=(${PV//[-\._]/ })
-
-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"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="debug doc ldap policykit"
-
-RDEPEND=">=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.8.16
-	>=dev-libs/dbus-glib-0.74
-	>=sys-apps/dbus-1
-	>=gnome-base/orbit-2.4
-	>=dev-libs/libxml2-2
-	ldap? ( net-nds/openldap )
-	policykit? ( sys-auth/polkit )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-gtk
-		--disable-static
-		$(use_with ldap openldap)
-		$(use_enable policykit defaults-service)"
-	kill_gconf
-
-	# Need host's IDL compiler for cross or native build, bug #262747
-	export EXTRA_EMAKE="${EXTRA_EMAKE} ORBIT_IDL=/usr/bin/orbit-idl-2"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not start gconfd when installing schemas, fix bug #238276, upstream ?
-	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
-
-	# Do not crash in gconf_entry_set_value() when entry pointer is NULL
-	epatch "${FILESDIR}/${P}-entry-set-value-sigsegv.patch"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
-
-# Can't run tests, missing script.
-#src_test() {
-#	emake -C tests || die "make tests failed"
-#	sh "${S}"/tests/runtests.sh || die "running tests failed"
-#}
-
-src_install() {
-	gnome2_src_install
-
-	keepdir /etc/gconf/gconf.xml.mandatory
-	keepdir /etc/gconf/gconf.xml.defaults
-	# Make sure this directory exists, bug #268070, upstream #572027
-	keepdir /etc/gconf/gconf.xml.system
-
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
-	doenvd 50gconf || die "doenv failed"
-	dodir /root/.gconfd
-}
-
-pkg_preinst() {
-	kill_gconf
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	# change the permissions to avoid some gconf bugs
-	einfo "changing permissions for gconf dirs"
-	find  /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
-	einfo "changing permissions for gconf files"
-	find  /etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-}
-
-kill_gconf() {
-	# This function will kill all running gconfd-2 that could be causing troubles
-	if [ -x /usr/bin/gconftool-2 ]
-	then
-		/usr/bin/gconftool-2 --shutdown
-	fi
-
-	return 0
-}
diff --git a/gnome-base/gconf/gconf-2.28.0.ebuild b/gnome-base/gconf/gconf-2.28.0.ebuild
deleted file mode 100644
index 5bc9bef6ff65..000000000000
--- a/gnome-base/gconf/gconf-2.28.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.28.0.ebuild,v 1.3 2010/05/22 16:19:45 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils gnome2
-
-MY_PN=GConf
-MY_P=${MY_PN}-${PV}
-PVP=(${PV//[-\._]/ })
-
-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"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sh ~sparc ~x86"
-IUSE="debug doc ldap policykit"
-
-RDEPEND=">=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.8.16
-	>=dev-libs/dbus-glib-0.74
-	>=sys-apps/dbus-1
-	>=gnome-base/orbit-2.4
-	>=dev-libs/libxml2-2
-	ldap? ( net-nds/openldap )
-	policykit? ( sys-auth/polkit )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-gtk
-		--disable-static
-		$(use_with ldap openldap)
-		$(use_enable policykit defaults-service)"
-	kill_gconf
-
-	# Need host's IDL compiler for cross or native build, bug #262747
-	export EXTRA_EMAKE="${EXTRA_EMAKE} ORBIT_IDL=/usr/bin/orbit-idl-2"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not start gconfd when installing schemas, fix bug #238276, upstream ?
-	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
-
-# Can't run tests, missing script.
-#src_test() {
-#	emake -C tests || die "make tests failed"
-#	sh "${S}"/tests/runtests.sh || die "running tests failed"
-#}
-
-src_install() {
-	gnome2_src_install
-
-	keepdir /etc/gconf/gconf.xml.mandatory
-	keepdir /etc/gconf/gconf.xml.defaults
-	# Make sure this directory exists, bug #268070, upstream #572027
-	keepdir /etc/gconf/gconf.xml.system
-
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
-	doenvd 50gconf || die "doenv failed"
-	dodir /root/.gconfd
-}
-
-pkg_preinst() {
-	kill_gconf
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	# change the permissions to avoid some gconf bugs
-	einfo "changing permissions for gconf dirs"
-	find  /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
-	einfo "changing permissions for gconf files"
-	find  /etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-}
-
-kill_gconf() {
-	# This function will kill all running gconfd-2 that could be causing troubles
-	if [ -x /usr/bin/gconftool-2 ]
-	then
-		/usr/bin/gconftool-2 --shutdown
-	fi
-
-	return 0
-}