From fbbdb27c44bf7203e734306fb0182f2432c8caea Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 7 Mar 2010 19:57:10 +0000 Subject: [PATCH] Clean up old revisions. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- app-office/planner/ChangeLog | 11 ++- app-office/planner/Manifest | 18 +++-- .../files/planner-0.14.3-build-failure.patch | 19 ----- .../files/planner-0.14.3-configure.patch | 76 ----------------- .../files/planner-0.14.3-parallel-build.patch | 48 ----------- app-office/planner/planner-0.14.3-r1.ebuild | 81 ------------------- app-office/planner/planner-0.14.3-r2.ebuild | 81 ------------------- 7 files changed, 20 insertions(+), 314 deletions(-) delete mode 100644 app-office/planner/files/planner-0.14.3-build-failure.patch delete mode 100644 app-office/planner/files/planner-0.14.3-configure.patch delete mode 100644 app-office/planner/files/planner-0.14.3-parallel-build.patch delete mode 100644 app-office/planner/planner-0.14.3-r1.ebuild delete mode 100644 app-office/planner/planner-0.14.3-r2.ebuild diff --git a/app-office/planner/ChangeLog b/app-office/planner/ChangeLog index dc67fc655f11..f8b823fb92f4 100644 --- a/app-office/planner/ChangeLog +++ b/app-office/planner/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/planner -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/planner/ChangeLog,v 1.55 2009/07/19 12:59:35 nixnut Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/planner/ChangeLog,v 1.56 2010/03/07 19:57:09 eva Exp $ + + 07 Mar 2010; Gilles Dartiguelongue + -planner-0.14.3-r1.ebuild, -planner-0.14.3-r2.ebuild, + -files/planner-0.14.3-build-failure.patch, + -files/planner-0.14.3-configure.patch, + -files/planner-0.14.3-parallel-build.patch: + Clean up old revisions. 19 Jul 2009; nixnut planner-0.14.4.ebuild: ppc stable #274376 diff --git a/app-office/planner/Manifest b/app-office/planner/Manifest index d1596cb6ab1a..c483c473b726 100644 --- a/app-office/planner/Manifest +++ b/app-office/planner/Manifest @@ -1,11 +1,15 @@ -AUX planner-0.14.3-build-failure.patch 569 RMD160 cf826cbb91f0d69579ad990de64614ba79461c70 SHA1 f10f67e5173df906d3a2b35f692c1c6b3cc58a24 SHA256 ef021dc3b7a7a457fb4fc00d458f92789195ee9407bf21872e27a4b80de280a3 -AUX planner-0.14.3-configure.patch 2141 RMD160 6a08c1da2d1f479fc6c38f4dda65ad805f3c76cd SHA1 9e74ba7eb1e9eeb386b8b0e23e71d38dc085ff4a SHA256 37e8c699771808482c37c408215d74b9d4d07bebf3a3eca56b28a7d4462e5275 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX planner-0.14.3-eds-plugin.patch 414 RMD160 f4c2889fee792dada172d29b892095c0e55b4932 SHA1 cfeb262519a716df225ca956876e1c64da47a58b SHA256 710dd83cdf908c263b9d3256a227006c7cda94b1ad8ceb46404465c521fcd0c6 -AUX planner-0.14.3-parallel-build.patch 1489 RMD160 0bbb3877df6f3388a048f0a117602b03f181947d SHA1 ad733e744e1c1525ebc865788cfc4ace4af1d60b SHA256 51feca273ff9caab5d25a1b053c0572f0820715ebd4b0b3fb17c04d08d65a965 -DIST planner-0.14.3.tar.bz2 3685823 RMD160 8e91c0afac14e7a6ac1f80d209a44bef5d1e1eb8 SHA1 aacdca51a16ef9e7024fbb674d5e8b1c24d088f1 SHA256 8fa5e28b0ba71c0822be73d3c0719623e711b5f9abdcddb63321e31c02a168fe DIST planner-0.14.4.tar.bz2 3738005 RMD160 61fae3ac84e703d360b1cba97410a89da876a293 SHA1 43ba90bd18fcd271c0da31e66d2fa1294831cf28 SHA256 d45efc53dae4e2b03e2ad8ac1c31f615bfd77e67500b11baf4dee49feee7147a -EBUILD planner-0.14.3-r1.ebuild 2005 RMD160 b513227468e49bed59ad6161b8d15a085cea29cd SHA1 1de690d9fc050850b570236016cac53d927da92d SHA256 e4c1b860427015934a6de9173c3cbb51e5a5edd96d67b85cb41ddc68bf806d4c -EBUILD planner-0.14.3-r2.ebuild 2007 RMD160 f44230da548bb89ca50e9fed1c7f7055416a8b10 SHA1 57e6c5abfc65a6800eab6905344f1e0928bfb323 SHA256 98875701d8b7004bca25ef5e7c2f5ff32715ca7cebb92138c8d942742a9b088b EBUILD planner-0.14.4.ebuild 1619 RMD160 c9abdc5f3278b1955fc60854c1285446f01dfb15 SHA1 b0115d9019193a649629b3ebd355802843e6fdd8 SHA256 068304af52ae8f214a42b3b3dc3ef70817c0def79079e5958bd77a1c80c5e9ac -MISC ChangeLog 10311 RMD160 87b4b83dd96ce0669a8188323716c9cd300f8963 SHA1 bccd801302699945d7a87feec89f167179e49e3d SHA256 c178709116b5168a604c3164ac22c4fcbdf97bbe703d03ac7a35102f0a2c5a17 +MISC ChangeLog 10577 RMD160 0429db3d6667269a3821bca0b2387290749a56ac SHA1 a74bf7d6534c891a24b9514e79286ac5fbd34aec SHA256 c6e451e9381f16d34a4b89c30b3ce886eefffab5133a310a531f3b1d3a388e06 MISC metadata.xml 167 RMD160 3b9bd7883121c8868b966914627e4f714f0334f5 SHA1 ec07f2508f1d0ed5a20416cdb42bf44ff9198923 SHA256 d1dbd0cf93ea6330c8c2fe1f02775bf64b3019bc51f7351606e3fa61a2d63a83 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkuUBRsACgkQ1fmVwcYIWAZibACgl7txmYc0jbZl4Sqmb+2g6MeL +cHkAoMyzupBFTE8RE/bAcvmeXK4j7i72 +=vaiD +-----END PGP SIGNATURE----- diff --git a/app-office/planner/files/planner-0.14.3-build-failure.patch b/app-office/planner/files/planner-0.14.3-build-failure.patch deleted file mode 100644 index 1317a2cb6d27..000000000000 --- a/app-office/planner/files/planner-0.14.3-build-failure.patch +++ /dev/null @@ -1,19 +0,0 @@ -# -# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=231823 -# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=539993 -# ---- a/libplanner/mrp-sql.c 2008/07/15 01:17:58 1.1 -+++ b/libplanner/mrp-sql.c 2008/07/15 01:19:28 -@@ -2405,9 +2405,9 @@ mrp_sql_load_project (MrpStorageSQL *sto - } - - #define WRITE_ERROR(e,c) \ --G_STMT_START \ --g_set_error(e,MRP_ERROR,MRP_ERROR_SAVE_WRITE_FAILED, sql_get_last_error (c)) \ --G_STMT_END -+G_STMT_START { \ -+g_set_error(e,MRP_ERROR,MRP_ERROR_SAVE_WRITE_FAILED, sql_get_last_error (c)); \ -+} G_STMT_END - - - /************************* diff --git a/app-office/planner/files/planner-0.14.3-configure.patch b/app-office/planner/files/planner-0.14.3-configure.patch deleted file mode 100644 index f59454f03fe4..000000000000 --- a/app-office/planner/files/planner-0.14.3-configure.patch +++ /dev/null @@ -1,76 +0,0 @@ -# -# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=562984 -# -Index: b/configure.in -=================================================================== ---- a/configure.in (révision 940) -+++ b/configure.in (copie de travail) -@@ -80,28 +81,40 @@ - dnl ----------- - dnl | Database/GDA check |---------------------------------------------- - dnl ----------- --AC_ARG_ENABLE(database, [ --enable-database=[no/yes] enable database support [default=no]], enable_database="$enableval", enable_database=no) -+AC_ARG_WITH(database, -+ AS_HELP_STRING([--with-database], -+ [enable database support @<:@default=no@:>@ (auto/no/gda1/gda2/gda3)]), -+ with_database="$withval", with_database=no) - --if test "x$enable_database" = "xyes" ; then -+GDA_VER= -+use_gda=no - -- PKG_CHECK_MODULES(GDA, libgda-3.0 >= 1.0, -- [ -- GDA_VER=30 -- ], -- [ -- PKG_CHECK_MODULES(GDA, libgda-2.0 >= 1.0, -- [ -- GDA_VER=20 -- ], -- [ -- PKG_CHECK_MODULES(GDA, libgda >= 1.0) -- GDA_VER=10 -- ]) -- ]) -- use_gda=yes --else -- use_gda=no -+case "$with_database" in -+auto|yes) -+ PKG_CHECK_MODULES(GDA, libgda-3.0 >= 1.0, [GDA_VER=30], -+ [PKG_CHECK_MODULES(GDA, libgda-2.0 >= 1.0, [GDA_VER=20], -+ [PKG_CHECK_MODULES(GDA, libgda >= 1.0, [GDA_VER=10]) -+ ]) -+ ]) -+ ;; -+*gda3*) -+ PKG_CHECK_MODULES(GDA, libgda-3.0 >= 1.0, [GDA_VER=30]) -+ ;; -+*gda2*) -+ PKG_CHECK_MODULES(GDA, libgda-2.0 >= 1.0, [GDA_VER=20]) -+ ;; -+*gda1*) -+ PKG_CHECK_MODULES(GDA, libgda >= 1.0, [GDA_VER=10]) -+ ;; -+*) -+ use_gda=no -+ ;; -+esac -+ -+if test x$GDA_VER != x; then -+ use_gda=yes - fi -+ - AC_SUBST(GDA_VER) - AM_CONDITIONAL(HAVE_GDA, test x$use_gda = xyes) - dnl ----------------------------------------------------------- -@@ -351,7 +364,7 @@ - echo "Python plugin : $enable_python_plugin" - #echo "Dotnet bindings : $have_dotnet" - echo "Simple priority scheduling : $use_simple_priority_scheduling" --echo "Database/GDA support : $use_gda" -+echo "Database/GDA support : $use_gda, $GDA_VER" - echo "Evolution Data Server import : $use_eds" - echo "Evolution Data Server backend: $use_eds_backend" - echo diff --git a/app-office/planner/files/planner-0.14.3-parallel-build.patch b/app-office/planner/files/planner-0.14.3-parallel-build.patch deleted file mode 100644 index 8224eb01c1fb..000000000000 --- a/app-office/planner/files/planner-0.14.3-parallel-build.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: tests/Makefile.am -=================================================================== ---- tests/Makefile.am (révision 909) -+++ tests/Makefile.am (copie de travail) -@@ -7,10 +7,6 @@ - -DG_LOG_DOMAIN=\"Planner\" \ - -DEXAMPLESDIR=\"$(top_srcdir)/tests/files\" - --LDADD = \ -- $(top_builddir)/libplanner/libplanner-1.la \ -- $(PLANNER_LIBS) -- - noinst_LTLIBRARIES = libselfcheck.la - - libselfcheck_la_SOURCES = \ -@@ -20,16 +16,28 @@ - noinst_PROGRAMS = scheduler-test time-test calendar-test task-test - - scheduler_test_SOURCES = scheduler-test.c --scheduler_test_LDFLAGS = libselfcheck.la -+scheduler_test_LDADD = \ -+ $(top_builddir)/libplanner/libplanner-1.la \ -+ $(PLANNER_LIBS) \ -+ libselfcheck.la - - time_test_SOURCES = time-test.c --time_test_LDFLAGS = libselfcheck.la -+time_test_LDADD = \ -+ $(top_builddir)/libplanner/libplanner-1.la \ -+ $(PLANNER_LIBS) \ -+ libselfcheck.la - - calendar_test_SOURCES = calendar-test.c --calendar_test_LDFLAGS = libselfcheck.la -+calendar_test_LDADD = \ -+ $(top_builddir)/libplanner/libplanner-1.la \ -+ $(PLANNER_LIBS) \ -+ libselfcheck.la - - task_test_SOURCES = task-test.c --task_test_LDFLAGS = libselfcheck.la -+task_test_LDADD = \ -+ $(top_builddir)/libplanner/libplanner-1.la \ -+ $(PLANNER_LIBS) \ -+ libselfcheck.la - - # The loadable modules can't be found at distcheck time so disable the - # tests for distcheck. diff --git a/app-office/planner/planner-0.14.3-r1.ebuild b/app-office/planner/planner-0.14.3-r1.ebuild deleted file mode 100644 index 2955ce85b9a6..000000000000 --- a/app-office/planner/planner-0.14.3-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/planner/planner-0.14.3-r1.ebuild,v 1.4 2009/01/17 14:58:54 nixnut Exp $ - -EAPI="1" - -inherit autotools eutils gnome2 - -DESCRIPTION="Project manager for Gnome2" -HOMEPAGE="http://live.gnome.org/Planner/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 ppc sparc x86" -IUSE="doc eds libgda python examples" - -RDEPEND=">=dev-libs/glib-2.6 - >=x11-libs/gtk+-2.6 - >=gnome-base/libgnomecanvas-2.10 - >=gnome-base/libgnomeui-2.10 - >=gnome-base/libglade-2.4 - >=gnome-base/gnome-vfs-2.10 - >=gnome-base/libgnomeprintui-2.10 - >=gnome-base/gconf-2.6 - >=dev-libs/libxml2-2.6.27 - >=dev-libs/libxslt-1.1.23 - libgda? ( gnome-extra/libgda:1 ) - python? ( >=dev-python/pygtk-2.6 ) - eds? ( - >=gnome-extra/evolution-data-server-1.1 - >=mail-client/evolution-2.1.3 )" - -# FIXME: disable eds backend for now, its experimental - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0 - app-text/scrollkeeper - >=dev-util/intltool-0.35.5 - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1.0 )" - -DOCS="AUTHORS COPYING ChangeLog INSTALL README" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_with libgda database gda1) - $(use_enable python) - $(use_enable python python-plugin) - $(use_enable eds) - --disable-update-mimedb" -# $(use_enable eds eds-backend) -} - -src_unpack() { - gnome2_src_unpack - - # Fix parallel build issues - epatch "${FILESDIR}/${P}-parallel-build.patch" - - # Fix compile failure with eds-plugin - epatch "${FILESDIR}/${P}-eds-plugin.patch" - - # Fix compilation failure with recent glib/gcc, bug #231823 - epatch "${FILESDIR}/${P}-build-failure.patch" - - # Fix libgda selection - epatch "${FILESDIR}/${P}-configure.patch" - - intltoolize --force || die "intltoolize failed" - eautoreconf -} - -src_install() { - gnome2_src_install \ - sqldocdir="\$(datadir)/doc/${PF}" \ - sampledir="\$(datadir)/doc/${PF}/examples" - - if ! use examples; then - rm -rf "${D}/usr/share/doc/${PF}/examples" - fi -} diff --git a/app-office/planner/planner-0.14.3-r2.ebuild b/app-office/planner/planner-0.14.3-r2.ebuild deleted file mode 100644 index d04f5857d73c..000000000000 --- a/app-office/planner/planner-0.14.3-r2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/planner/planner-0.14.3-r2.ebuild,v 1.1 2008/12/04 15:35:15 eva Exp $ - -EAPI="1" - -inherit autotools eutils gnome2 - -DESCRIPTION="Project manager for Gnome2" -HOMEPAGE="http://live.gnome.org/Planner/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -IUSE="doc eds libgda python examples" - -RDEPEND=">=dev-libs/glib-2.6 - >=x11-libs/gtk+-2.6 - >=gnome-base/libgnomecanvas-2.10 - >=gnome-base/libgnomeui-2.10 - >=gnome-base/libglade-2.4 - >=gnome-base/gnome-vfs-2.10 - >=gnome-base/libgnomeprintui-2.10 - >=gnome-base/gconf-2.6 - >=dev-libs/libxml2-2.6.27 - >=dev-libs/libxslt-1.1.23 - libgda? ( gnome-extra/libgda:3 ) - python? ( >=dev-python/pygtk-2.6 ) - eds? ( - >=gnome-extra/evolution-data-server-1.1 - >=mail-client/evolution-2.1.3 )" - -# FIXME: disable eds backend for now, its experimental - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0 - app-text/scrollkeeper - >=dev-util/intltool-0.35.5 - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1.0 )" - -DOCS="AUTHORS COPYING ChangeLog INSTALL README" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_with libgda database gda3) - $(use_enable python) - $(use_enable python python-plugin) - $(use_enable eds) - --disable-update-mimedb" -# $(use_enable eds eds-backend) -} - -src_unpack() { - gnome2_src_unpack - - # Fix parallel build issues - epatch "${FILESDIR}/${P}-parallel-build.patch" - - # Fix compile failure with eds-plugin - epatch "${FILESDIR}/${P}-eds-plugin.patch" - - # Fix compilation failure with recent glib/gcc, bug #231823 - epatch "${FILESDIR}/${P}-build-failure.patch" - - # Fix libgda selection - epatch "${FILESDIR}/${P}-configure.patch" - - intltoolize --force || die "intltoolize failed" - eautoreconf -} - -src_install() { - gnome2_src_install \ - sqldocdir="\$(datadir)/doc/${PF}" \ - sampledir="\$(datadir)/doc/${PF}/examples" - - if ! use examples; then - rm -rf "${D}/usr/share/doc/${PF}/examples" - fi -} -- 2.26.2