diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2008-08-04 22:34:35 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-08-04 22:34:35 +0000 |
commit | 111b163aa5472faa98c6abf5c197bbf13c97841f (patch) | |
tree | 0d9551a9ff0504a3096596e0ecbed404ee465884 /app-misc/workrave | |
parent | clean up old revisions. (diff) | |
download | gentoo-2-111b163aa5472faa98c6abf5c197bbf13c97841f.tar.gz gentoo-2-111b163aa5472faa98c6abf5c197bbf13c97841f.tar.bz2 gentoo-2-111b163aa5472faa98c6abf5c197bbf13c97841f.zip |
clean up old revisions.
(Portage version: 2.2_rc3/cvs/Linux 2.6.26-gentoo-mactel x86_64)
Diffstat (limited to 'app-misc/workrave')
-rw-r--r-- | app-misc/workrave/ChangeLog | 9 | ||||
-rw-r--r-- | app-misc/workrave/files/org.workrave.Workrave.service.in | 3 | ||||
-rw-r--r-- | app-misc/workrave/files/workrave-1.6.2-nls_macros.patch | 63 | ||||
-rw-r--r-- | app-misc/workrave/files/workrave-1.8.4-no_gnome.patch | 17 | ||||
-rw-r--r-- | app-misc/workrave/workrave-1.8.3.ebuild | 76 | ||||
-rw-r--r-- | app-misc/workrave/workrave-1.8.4.ebuild | 86 |
6 files changed, 8 insertions, 246 deletions
diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog index 5404038d2fba..04a21910cec6 100644 --- a/app-misc/workrave/ChangeLog +++ b/app-misc/workrave/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-misc/workrave # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.52 2008/07/31 17:23:36 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.53 2008/08/04 22:34:34 eva Exp $ + + 04 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org> + -files/workrave-1.6.2-nls_macros.patch, + -files/workrave-1.8.4-no_gnome.patch, + -files/org.workrave.Workrave.service.in, -workrave-1.8.3.ebuild, + -workrave-1.8.4.ebuild: + clean up old revisions. 31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml: Add USE flag description to metadata wrt GLEP 56. diff --git a/app-misc/workrave/files/org.workrave.Workrave.service.in b/app-misc/workrave/files/org.workrave.Workrave.service.in deleted file mode 100644 index ef00d37747d7..000000000000 --- a/app-misc/workrave/files/org.workrave.Workrave.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[Workrave D-BUS Service] -Name=org.workrave.Workrave -Exec=@bindir@/workrave diff --git a/app-misc/workrave/files/workrave-1.6.2-nls_macros.patch b/app-misc/workrave/files/workrave-1.6.2-nls_macros.patch deleted file mode 100644 index 0a72400da1e2..000000000000 --- a/app-misc/workrave/files/workrave-1.6.2-nls_macros.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -NurdB workrave-1.6.2-orig/common/include/nls.h workrave-1.6.2/common/include/nls.h ---- workrave-1.6.2-orig/common/include/nls.h 2005-03-28 11:42:00.000000000 -0500 -+++ workrave-1.6.2/common/include/nls.h 2005-03-28 14:40:17.000000000 -0500 -@@ -27,28 +27,23 @@ - - #include <glib/glist.h> - --#ifdef HAVE_GNOME --# include <gnome.h> --#else --# ifdef ENABLE_NLS --# include <locale.h> --# include <libintl.h> --# define _(String) gettext (String) --# ifdef gettext_noop --# define N_(String) gettext_noop (String) --# else --# define N_(String) (String) --# endif -+#ifdef ENABLE_NLS -+# ifdef HAVE_GNOME -+# include <gnome.h> - # else --/* Stubs that do something close enough. */ --# define textdomain(String) (String) --# define gettext(String) (String) --# define dgettext(Domain,Message) (Message) --# define dcgettext(Domain,Message,Type) (Message) --# define bindtextdomain(Domain,Directory) (Domain) --# define _(String) (String) -+# include <locale.h> -+# include <libintl.h> -+# define _(String) gettext (String) -+# ifdef gettext_noop -+# define N_(String) gettext_noop (String) -+# else - # define N_(String) (String) -+# endif - # endif -+#else -+/* Stubs that do something close enough. */ -+# define _(String) (String) -+# define N_(String) (String) - #endif - - #ifdef __cplusplus -diff -NurdB workrave-1.6.2-orig/frontend/gtkmm/src/RemoteControl.cc workrave-1.6.2/frontend/gtkmm/src/RemoteControl.cc ---- workrave-1.6.2-orig/frontend/gtkmm/src/RemoteControl.cc 2005-03-28 11:42:00.000000000 -0500 -+++ workrave-1.6.2/frontend/gtkmm/src/RemoteControl.cc 2005-03-28 15:17:39.000000000 -0500 -@@ -22,12 +22,12 @@ - - #include "debug.hh" - --#include "RemoteControl.hh" - - #include "GUI.hh" - #include "AppletWindow.hh" - - #include "Menus.hh" -+#include "RemoteControl.hh" - - WR_INIT() - diff --git a/app-misc/workrave/files/workrave-1.8.4-no_gnome.patch b/app-misc/workrave/files/workrave-1.8.4-no_gnome.patch deleted file mode 100644 index 0b99c254bcc6..000000000000 --- a/app-misc/workrave/files/workrave-1.8.4-no_gnome.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -NurdpB workrave-1.8.4/frontend/gtkmm/src/Menus.hh workrave-1.8.4-patched/frontend/gtkmm/src/Menus.hh ---- workrave-1.8.4/frontend/gtkmm/src/Menus.hh 2007-03-05 12:52:07.000000000 -0500 -+++ workrave-1.8.4-patched/frontend/gtkmm/src/Menus.hh 2007-03-15 20:02:11.000000000 -0500 -@@ -186,13 +186,11 @@ Menus::set_main_window(MainWindow *main) - } - - --#if defined(HAVE_GNOME) || defined(WIN32) - inline Menus * - Menus::get_instance() - { - assert(instance != 0); - return instance; - } --#endif - - #endif // MENUS_HH diff --git a/app-misc/workrave/workrave-1.8.3.ebuild b/app-misc/workrave/workrave-1.8.3.ebuild deleted file mode 100644 index a65884ee4314..000000000000 --- a/app-misc/workrave/workrave-1.8.3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.8.3.ebuild,v 1.7 2007/07/22 09:50:08 omp Exp $ - -inherit eutils gnome2 - -DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)" -HOMEPAGE="http://workrave.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="arts distribution gnome kde nls xml" - -# configure.ac checks for dbus but the code doesn't actually use it -RDEPEND=">=dev-libs/glib-2 - >=gnome-base/gconf-2 - >=x11-libs/gtk+-2 - >=dev-cpp/gtkmm-2.4 - >=dev-cpp/glibmm-2.4 - >=dev-libs/libsigc++-2 - gnome? ( - >=gnome-base/libgnomeui-2 - >=dev-cpp/libgnomeuimm-2.6 - >=gnome-base/gnome-panel-2.0.10 - >=gnome-base/libbonobo-2 - >=gnome-base/orbit-2.8.3 ) - distribution? ( >=net-libs/gnet-2 ) - xml? ( dev-libs/gdome2 ) - kde? ( - =x11-libs/qt-3* - kde-base/kdelibs ) - arts? ( kde-base/arts ) - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXmu" - -DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/inputproto - x11-proto/recordproto - nls? ( sys-devel/gettext ) - >=dev-util/pkgconfig-0.9" - -MAKEOPTS="${MAKEOPTS} -j1" -DOCS="AUTHORS ChangeLog NEWS README TODO" - -pkg_setup() { - G2CONF="--enable-gconf \ - $(use_enable distribution) \ - $(use_enable nls) \ - $(use_enable xml) \ - $(use_enable gnome) \ - $(use_enable gnome gnomemm) \ - $(use_enable kde) \ - $(use_with arts)" -} - -src_unpack() { - unpack "${A}" - cd "${S}" - - # Removes a few broken macros. See bug #86939. - epatch "${FILESDIR}"/${PN}-1.6.2-nls_macros.patch -} - -src_compile() { - if use kde; then - addwrite "/usr/qt/3/etc/settings" - export KDEDIR=$(kde-config --prefix) - einfo "KDEDIR set to ${KDEDIR}" - fi - - gnome2_src_compile -} diff --git a/app-misc/workrave/workrave-1.8.4.ebuild b/app-misc/workrave/workrave-1.8.4.ebuild deleted file mode 100644 index 18ad684a4de4..000000000000 --- a/app-misc/workrave/workrave-1.8.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.8.4.ebuild,v 1.2 2007/07/12 03:35:11 mr_bones_ Exp $ - -inherit eutils gnome2 - -DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)" -HOMEPAGE="http://workrave.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-2.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="arts dbus distribution gnome kde nls xml" - -RDEPEND=">=dev-libs/glib-2 - >=gnome-base/gconf-2 - >=x11-libs/gtk+-2 - >=dev-cpp/gtkmm-2.4 - >=dev-cpp/glibmm-2.4 - >=dev-libs/libsigc++-2 - gnome? ( - >=gnome-base/libgnomeui-2 - >=dev-cpp/libgnomeuimm-2.6 - >=gnome-base/gnome-panel-2.0.10 - >=gnome-base/libbonobo-2 - >=gnome-base/orbit-2.8.3 ) - distribution? ( >=net-libs/gnet-2 ) - dbus? ( - >=sys-apps/dbus-0.92 - dev-libs/dbus-glib ) - xml? ( dev-libs/gdome2 ) - kde? ( - =x11-libs/qt-3* - kde-base/kdelibs ) - arts? ( kde-base/arts ) - - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXmu" - -DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/inputproto - x11-proto/recordproto - - nls? ( sys-devel/gettext ) - >=dev-util/pkgconfig-0.9" - -MAKEOPTS="${MAKEOPTS} -j1" -DOCS="AUTHORS NEWS README TODO" - -pkg_setup() { - G2CONF="--enable-gconf \ - $(use_enable dbus) \ - $(use_enable distribution) \ - $(use_enable gnome) \ - $(use_enable gnome gnomemm) \ - $(use_enable kde) \ - $(use_enable nls) \ - $(use_enable xml) \ - $(use_with arts)" -} - -src_unpack() { - gnome2_src_unpack - - # Removes a few broken macros. See bug #86939. - epatch "${FILESDIR}/${P}-nls_macros.patch" - - # Fix compilation with USE=-gnome - epatch "${FILESDIR}/${P}-no_gnome.patch" - - # File missing from the tarball - cp "${FILESDIR}"/org.workrave.Workrave.service.in ${S}/backend/src -} - -src_compile() { - if use kde; then - addwrite "/usr/qt/3/etc/settings" - export KDEDIR=$(kde-config --prefix) - einfo "KDEDIR set to ${KDEDIR}" - fi - - gnome2_src_compile -} |