diff options
| author |   Henrik Brix Andersen <brix@gentoo.org> | 2005-10-22 16:01:23 +0000 |
|---|---|---|
| committer | Henrik Brix Andersen <brix@gentoo.org> | 2005-10-22 16:01:23 +0000 |
| commit | bab37c7ddc46464a6dda69d05549ab680f705b63 (patch) | |
| tree | d200d3a9ec14f6315c2601ab588cdaabcad364c8 /sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild | |
| parent | Removed unnecessary conditional operations for ppc-macos (bug #110127). (diff) | |
| download | historical-bab37c7ddc46464a6dda69d05549ab680f705b63.tar.gz historical-bab37c7ddc46464a6dda69d05549ab680f705b63.tar.bz2 historical-bab37c7ddc46464a6dda69d05549ab680f705b63.zip | |
Always build with GTK+-2 support with USE=gtk, bug #106560.
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild')
| -rw-r--r-- | sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild index 1e4bc5e68135..3f0bfc32be71 100644 --- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild +++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild,v 1.4 2005/08/14 10:02:07 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild,v 1.5 2005/10/22 16:01:23 brix Exp $ inherit eutils flag-o-matic toolchain-funcs linux-info @@ -12,12 +12,11 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ppc x86" -IUSE="gtk gtk2 vanilla trusted X xforms" +IUSE="gtk vanilla trusted X xforms" RDEPEND="!sys-apps/pcmcia-cs-cis X? ( virtual/x11 - gtk? ( gtk2? ( =x11-libs/gtk+-2* - dev-util/pkgconfig ) - !gtk2? ( =x11-libs/gtk+-1* ) ) + gtk? ( =x11-libs/gtk+-2* + dev-util/pkgconfig ) xforms? ( x11-libs/xforms ) )" DEPEND="${RDEPEND} virtual/linux-sources @@ -42,7 +41,6 @@ pkg_setup() { fi } - src_unpack() { unpack ${A} @@ -109,14 +107,8 @@ src_compile() { if use gtk; then echo "HAS_GTK=y" >> ${CONFIG_FILE} - - if use gtk2; then - echo "GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0)" >> ${CONFIG_FILE} - echo "GTK_LIBS=$(pkg-config --libs gtk+-2.0)" >> ${CONFIG_FILE} - else - echo "GTK_CFLAGS=$(gtk-config --cflags)" >> ${CONFIG_FILE} - echo "GTK_LIBS=$(gtk-config --libs)" >> ${CONFIG_FILE} - fi + echo "GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0)" >> ${CONFIG_FILE} + echo "GTK_LIBS=$(pkg-config --libs gtk+-2.0)" >> ${CONFIG_FILE} fi if use xforms; then |