diff options
| author |   Leonardo Boshell <leonardop@gentoo.org> | 2003-11-06 15:04:32 +0000 |
|---|---|---|
| committer | Leonardo Boshell <leonardop@gentoo.org> | 2003-11-06 15:04:32 +0000 |
| commit | 3efaf29ab79646747fccc213d5f8635e7ef37309 (patch) | |
| tree | f359e9243ab524866c9a981f1cc63ad3e25626d5 /app-misc | |
| parent | Changed "bison -y" to "yacc" for YACC. Closing bug 29691. (diff) | |
| download | gentoo-2-3efaf29ab79646747fccc213d5f8635e7ef37309.tar.gz gentoo-2-3efaf29ab79646747fccc213d5f8635e7ef37309.tar.bz2 gentoo-2-3efaf29ab79646747fccc213d5f8635e7ef37309.zip | |
Corrections as per bug #31662
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/workrave/Manifest | 2 | ||||
| -rw-r--r-- | app-misc/workrave/workrave-1.4.0-r1.ebuild | 21 |
2 files changed, 17 insertions, 6 deletions
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest index 0288e106fc54..7486a404b972 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 0e5292cea917a34049c946dfccefc35c workrave-1.4.0-r1.ebuild 2141 +MD5 e21b761e9608e48690d845f3ecd264c6 workrave-1.4.0-r1.ebuild 2275 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 4db5207a831a..365e5bbd4d7c 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.4 2003/10/24 13:02:20 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.0-r1.ebuild,v 1.5 2003/11/06 15:04:26 leonardop Exp $ IUSE="debug gnome nls xml2" # Internal USE flags @@ -27,10 +27,11 @@ RDEPEND=">=dev-libs/glib-2 gnome? ( >=gnome-base/libgnomeui-2 >=dev-cpp/libgnomeuimm-2 >=gnome-base/gnome-panel-2.0.10 - >=gnome-base/libbonobo-2 ) + >=gnome-base/libbonobo-2 + >=gnome-base/gconf-2 ) nls? ( sys-devel/gettext ) xml2? ( dev-libs/gdome2 ) - !xml2? ( >=gnome-base/gconf-2 )" + !xml2? ( !gnome? ( >=gnome-base/gconf-2 ) )" DEPEND="${RDEPEND} dev-util/pkgconfig" @@ -54,12 +55,22 @@ src_compile() { use debug && myconf="${myconf} --enable-debug" use distribution || myconf="${myconf} --disable-distribution" - 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" + + if [ `use gnome` ] + then + myconf="${myconf} --enable-gconf" + else + myconf="${myconf} --disable-gnome" + fi + + if [ ! `use gnome` ] && [ ! `use xml2` ] + then myconf="${myconf} --enable-gconf" + fi econf ${myconf} || die |