From: Leonardo Boshell Date: Fri, 16 Mar 2007 02:48:57 +0000 (+0000) Subject: New release: 1.8.4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=871110dfea66dc67d178d880555ef4e4561b8165;p=gentoo.git New release: 1.8.4 Package-Manager: portage-2.1.2.2 --- diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog index af82734d07ec..c3be671b433c 100644 --- a/app-misc/workrave/ChangeLog +++ b/app-misc/workrave/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-misc/workrave # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.44 2007/02/16 23:38:10 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.45 2007/03/16 02:48:57 leonardop Exp $ + +*workrave-1.8.4 (16 Mar 2007) + + 16 Mar 2007; Leonardo Boshell + +files/workrave-1.8.4-nls_macros.patch, + +files/workrave-1.8.4-no_gnome.patch, + +files/org.workrave.Workrave.service.in, +workrave-1.8.4.ebuild: + New release. Re-added 'dbus' USE flag. Dropped virtual/x11 dependency. Added + patch to fix compilation with USE=-gnome. Don't install ChangeLog since + it's an empty document. 16 Feb 2007; Leonardo Boshell workrave-1.8.3.ebuild: diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest index 05e9c8bc805f..ccae741f6c48 100644 --- a/app-misc/workrave/Manifest +++ b/app-misc/workrave/Manifest @@ -1,16 +1,33 @@ +AUX org.workrave.Workrave.service.in 75 RMD160 a0554af1c3638dfe2ae131862dc295e7dbf6035e SHA1 1ee7f455b9040bfdf9728455ce620d28af3794e0 SHA256 4ee93c57351873ef80b9b05a3ea4eb51a2587373548658da577712beecc26be4 +MD5 735399454839522bfbffa7e992c665b8 files/org.workrave.Workrave.service.in 75 +RMD160 a0554af1c3638dfe2ae131862dc295e7dbf6035e files/org.workrave.Workrave.service.in 75 +SHA256 4ee93c57351873ef80b9b05a3ea4eb51a2587373548658da577712beecc26be4 files/org.workrave.Workrave.service.in 75 AUX workrave-1.6.2-nls_macros.patch 1875 RMD160 d08a0f1fe968b5f42db3c8527d4189d7f10155b7 SHA1 b1bd259cf1ee74c801e52c8471e16cecaacf4ce2 SHA256 5da8371b332c52eebc9997860a743f30e112f523a73e2ad46702d9bab6a31b3d MD5 76dba7475a2cf72d9fc5d11df9d35881 files/workrave-1.6.2-nls_macros.patch 1875 RMD160 d08a0f1fe968b5f42db3c8527d4189d7f10155b7 files/workrave-1.6.2-nls_macros.patch 1875 SHA256 5da8371b332c52eebc9997860a743f30e112f523a73e2ad46702d9bab6a31b3d files/workrave-1.6.2-nls_macros.patch 1875 +AUX workrave-1.8.4-nls_macros.patch 1985 RMD160 a9334444d5aef1dd538139ee0ccae16b80dfe239 SHA1 8b64b52ab88201c91e9d77a14551f14c99568128 SHA256 7de293e74864c57a1833701aaaeb46b31ff7467cf6e91a95756eb6ce29530c54 +MD5 a8aff2529e4086a76c676a287932cc19 files/workrave-1.8.4-nls_macros.patch 1985 +RMD160 a9334444d5aef1dd538139ee0ccae16b80dfe239 files/workrave-1.8.4-nls_macros.patch 1985 +SHA256 7de293e74864c57a1833701aaaeb46b31ff7467cf6e91a95756eb6ce29530c54 files/workrave-1.8.4-nls_macros.patch 1985 +AUX workrave-1.8.4-no_gnome.patch 515 RMD160 affda3c725dcb99bf3b2d49c12c869eeec26f9d2 SHA1 a88ca76f52018805172d1a9d5f78bb0dcdcd0e90 SHA256 a0cf7b48a46643afee13e43e0967f1e066d5030fe98a7f74cbbc113a5fc0824e +MD5 57764ca0a3ee34a04976c2cc4037fce9 files/workrave-1.8.4-no_gnome.patch 515 +RMD160 affda3c725dcb99bf3b2d49c12c869eeec26f9d2 files/workrave-1.8.4-no_gnome.patch 515 +SHA256 a0cf7b48a46643afee13e43e0967f1e066d5030fe98a7f74cbbc113a5fc0824e files/workrave-1.8.4-no_gnome.patch 515 DIST workrave-1.8.3.tar.gz 1604897 RMD160 2bc139714323cb48a77977ccaeb4aaf50a8c9571 SHA1 276df08e69f5477cdfa66071eed138b2da3de97e SHA256 411487f55d7e15e68618d30f9931bffafb3154cac36d7ea15ea5f80c3bbac10f +DIST workrave-1.8.4-2.tar.gz 1907721 RMD160 95498e202d4e4d848b61cfc93b3c8673f6edf4cb SHA1 890e186527e03afd1652934b2f01e0e0133055fe SHA256 af79f4b11e5a51fc5f0e4c32f92334b0a6f0c04b4d27b1dab40568eb09d016e8 EBUILD workrave-1.8.3.ebuild 1896 RMD160 924f53d0f3861b2b1bb5eb0f6fa60ae75022eacc SHA1 d7f5ef0f803a47b233cb3c491e4a07217c2b8b9b SHA256 230d594465e71596d4e022beb5fb8bed606bd0f1193e4724455b10b8719a8f84 MD5 b6166b9724e50ea2f22678c40ef044cd workrave-1.8.3.ebuild 1896 RMD160 924f53d0f3861b2b1bb5eb0f6fa60ae75022eacc workrave-1.8.3.ebuild 1896 SHA256 230d594465e71596d4e022beb5fb8bed606bd0f1193e4724455b10b8719a8f84 workrave-1.8.3.ebuild 1896 -MISC ChangeLog 6483 RMD160 5e6fbb8949fe89ae9acd576f078b8133d9b47b52 SHA1 972cca9dfebf9ed42d1f075d0f6c7b0d6b0e7d88 SHA256 e9c63fcbc02a90d40754846ebfe08fa0acc7ce2b2dc7d7e29e6319b0e147d591 -MD5 b5c540c76f4692264cab99f6974738a9 ChangeLog 6483 -RMD160 5e6fbb8949fe89ae9acd576f078b8133d9b47b52 ChangeLog 6483 -SHA256 e9c63fcbc02a90d40754846ebfe08fa0acc7ce2b2dc7d7e29e6319b0e147d591 ChangeLog 6483 +EBUILD workrave-1.8.4.ebuild 2019 RMD160 4d3f13c795ee0fe0269b10af26f33348eea9f219 SHA1 e3399ca90a478a6bc724b128708c4121c02116be SHA256 2519f0b20f1ef46de0260b311ffd1789ccf95af421f2b5eaef8038689d7ce745 +MD5 1bc27f24a6196700b0d2bff1fd4d2d3c workrave-1.8.4.ebuild 2019 +RMD160 4d3f13c795ee0fe0269b10af26f33348eea9f219 workrave-1.8.4.ebuild 2019 +SHA256 2519f0b20f1ef46de0260b311ffd1789ccf95af421f2b5eaef8038689d7ce745 workrave-1.8.4.ebuild 2019 +MISC ChangeLog 6898 RMD160 c9455f4feec8efa074ac53e61d001cd35bcf101e SHA1 cd47f73b813ef7e2906b7d643de129ed42df478b SHA256 eb3ab5576ccbbdd8703113bd859c87b884550c25ce3fbd5b549bcff932c947c2 +MD5 e501b473445c4309a41447cec0f56c89 ChangeLog 6898 +RMD160 c9455f4feec8efa074ac53e61d001cd35bcf101e ChangeLog 6898 +SHA256 eb3ab5576ccbbdd8703113bd859c87b884550c25ce3fbd5b549bcff932c947c2 ChangeLog 6898 MISC metadata.xml 530 RMD160 6718f23491d41bd50b837451c2d0312993dccd55 SHA1 dfd3de105aa18aa27697bf04484da96c50a7f1f1 SHA256 ed4b48f812cc1fd9ef34b5cb60152112b052547e0b35860e475b5029554e461e MD5 67c79a367364e0cd7ae0e3592f0c35e0 metadata.xml 530 RMD160 6718f23491d41bd50b837451c2d0312993dccd55 metadata.xml 530 @@ -18,3 +35,6 @@ SHA256 ed4b48f812cc1fd9ef34b5cb60152112b052547e0b35860e475b5029554e461e metadata MD5 7e86136865ab686d204efd2304c376da files/digest-workrave-1.8.3 247 RMD160 c416e078b0b3d79c8e1eef77b9768bccff1ba726 files/digest-workrave-1.8.3 247 SHA256 0d832380d5247b1c4e3f17e3236858cd02960802bff1e2a7111202f10006e2f4 files/digest-workrave-1.8.3 247 +MD5 5e9e9c6275f17d42d75a44c66931e314 files/digest-workrave-1.8.4 253 +RMD160 dd48704d48035339b54eff4e18609c9d51d6ad3a files/digest-workrave-1.8.4 253 +SHA256 37929bef693d0aae146c0764e5f15e8af87397b3183b984caf063d75de28d86f files/digest-workrave-1.8.4 253 diff --git a/app-misc/workrave/files/digest-workrave-1.8.4 b/app-misc/workrave/files/digest-workrave-1.8.4 new file mode 100644 index 000000000000..b15e308a6504 --- /dev/null +++ b/app-misc/workrave/files/digest-workrave-1.8.4 @@ -0,0 +1,3 @@ +MD5 ddb2d1d86b4adbe00fe662f0015bc6b4 workrave-1.8.4-2.tar.gz 1907721 +RMD160 95498e202d4e4d848b61cfc93b3c8673f6edf4cb workrave-1.8.4-2.tar.gz 1907721 +SHA256 af79f4b11e5a51fc5f0e4c32f92334b0a6f0c04b4d27b1dab40568eb09d016e8 workrave-1.8.4-2.tar.gz 1907721 diff --git a/app-misc/workrave/files/org.workrave.Workrave.service.in b/app-misc/workrave/files/org.workrave.Workrave.service.in new file mode 100644 index 000000000000..ef00d37747d7 --- /dev/null +++ b/app-misc/workrave/files/org.workrave.Workrave.service.in @@ -0,0 +1,3 @@ +[Workrave D-BUS Service] +Name=org.workrave.Workrave +Exec=@bindir@/workrave diff --git a/app-misc/workrave/files/workrave-1.8.4-nls_macros.patch b/app-misc/workrave/files/workrave-1.8.4-nls_macros.patch new file mode 100644 index 000000000000..19ac5da3b78c --- /dev/null +++ b/app-misc/workrave/files/workrave-1.8.4-nls_macros.patch @@ -0,0 +1,64 @@ +diff -NurdpB workrave-1.8.4/common/include/nls.h workrave-1.8.4-patched/common/include/nls.h +--- workrave-1.8.4/common/include/nls.h 2007-03-04 13:56:45.000000000 -0500 ++++ workrave-1.8.4-patched/common/include/nls.h 2007-03-15 17:59:05.000000000 -0500 +@@ -25,28 +25,23 @@ + #ifndef WORKRAVE_NLS_H + #define WORKRAVE_NLS_H + +-#ifdef HAVE_GNOME +-# include +-#else +-# ifdef ENABLE_NLS +-# include +-# include +-# 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 + # 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 ++# include ++# 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 -NurdpB workrave-1.8.4/frontend/gtkmm/src/RemoteControl.cc workrave-1.8.4-patched/frontend/gtkmm/src/RemoteControl.cc +--- workrave-1.8.4/frontend/gtkmm/src/RemoteControl.cc 2007-03-04 13:56:38.000000000 -0500 ++++ workrave-1.8.4-patched/frontend/gtkmm/src/RemoteControl.cc 2007-03-15 17:59:43.000000000 -0500 +@@ -22,13 +22,12 @@ static const char rcsid[] = "$Id: Remote + + #include "debug.hh" + +-#include "RemoteControl.hh" +- + #include "GUI.hh" + #include "AppletControl.hh" + #include "GnomeAppletWindow.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 new file mode 100644 index 000000000000..0b99c254bcc6 --- /dev/null +++ b/app-misc/workrave/files/workrave-1.8.4-no_gnome.patch @@ -0,0 +1,17 @@ +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.4.ebuild b/app-misc/workrave/workrave-1.8.4.ebuild new file mode 100644 index 000000000000..dfa4686c038b --- /dev/null +++ b/app-misc/workrave/workrave-1.8.4.ebuild @@ -0,0 +1,87 @@ +# 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.1 2007/03/16 02:48:57 leonardop 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 +}