diff options
| -rw-r--r-- | app-misc/workrave/Manifest | 2 | ||||
| -rw-r--r-- | app-misc/workrave/workrave-1.4.0-r1.ebuild | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest index 12a94b542dc8..0288e106fc54 100644 --- a/app-misc/workrave/Manifest +++ b/app-misc/workrave/Manifest @@ -2,7 +2,7 @@ MD5 b4985c9cdc448c81a24b64bd0b21d2ba ChangeLog 1459 MD5 80c52743a9a0fa5e38fff1e7463fc9dd workrave-1.0.0.ebuild 1013 MD5 cc5c432bc40bd47f5ae7f5fb15fc4380 workrave-1.2.2.ebuild 1324 MD5 ffcad1d8e958149e36b9d2c454ed008f workrave-1.4.0.ebuild 1686 -MD5 06f0e6e71bf128fd9669d38b33f6ab22 workrave-1.4.0-r1.ebuild 2151 +MD5 0e5292cea917a34049c946dfccefc35c workrave-1.4.0-r1.ebuild 2141 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 eee2df47107a2d3cb227075415706c59 files/digest-workrave-1.0.0 66 MD5 bc9d7939a5ed8b03c2c327360e7b1c43 files/digest-workrave-1.4.0-r1 66 diff --git a/app-misc/workrave/workrave-1.4.0-r1.ebuild b/app-misc/workrave/workrave-1.4.0-r1.ebuild index e3821e13c208..4db5207a831a 100644 --- a/app-misc/workrave/workrave-1.4.0-r1.ebuild +++ b/app-misc/workrave/workrave-1.4.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.0-r1.ebuild,v 1.3 2003/10/24 11:04:54 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.0-r1.ebuild,v 1.4 2003/10/24 13:02:20 leonardop Exp $ IUSE="debug gnome nls xml2" # Internal USE flags @@ -23,15 +23,14 @@ RDEPEND=">=dev-libs/glib-2 >=x11-libs/gtk+-2 >=dev-cpp/gtkmm-2 >=dev-libs/libsigc++-1.2 - dev-util/pkgconfig distribution? ( >=net-libs/gnet-2 ) gnome? ( >=gnome-base/libgnomeui-2 >=dev-cpp/libgnomeuimm-2 >=gnome-base/gnome-panel-2.0.10 - >=gnome-base/libbonobo-2 - >=gnome-base/gconf-2 ) + >=gnome-base/libbonobo-2 ) nls? ( sys-devel/gettext ) - xml2? ( dev-libs/gdome2 )" + xml2? ( dev-libs/gdome2 ) + !xml2? ( >=gnome-base/gconf-2 )" DEPEND="${RDEPEND} dev-util/pkgconfig" @@ -42,12 +41,12 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${P}-gcc2_fixes.patch + # need to remove the configure specified CFLAGS sed -e "/CFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \ < configure > configure.sed sed -e "/CXXFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \ < configure.sed > configure - } src_compile() { @@ -55,12 +54,12 @@ src_compile() { use debug && myconf="${myconf} --enable-debug" use distribution || myconf="${myconf} --disable-distribution" - use gnome && myconf="${myconf} --enable-gconf" || \ - myconf="${myconf} --disable-gnome" + use gnome || myconf="${myconf} --disable-gnome" use nls || myconf="${myconf} --disable-nls" use no-exercises || myconf="${myconf} --enable-exercises" use no-experimental && myconf="${myconf} --disable-experimental" - use xml2 && myconf="${myconf} --enable-xml" + use xml2 && myconf="${myconf} --enable-xml" || \ + myconf="${myconf} --enable-gconf" econf ${myconf} || die |