diff options
| -rw-r--r-- | sys-apps/pcmcia-cs/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.8 | 1 | ||||
| -rw-r--r-- | sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.7-move-pnp-ids-to-usr-share-misc.patch | 38 | ||||
| -rw-r--r-- | sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-includes.patch | 12 | ||||
| -rw-r--r-- | sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild | 20 | ||||
| -rw-r--r-- | sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild | 149 |
6 files changed, 13 insertions, 215 deletions
diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog index 1e80ebea68bc..ad8cf09941b6 100644 --- a/sys-apps/pcmcia-cs/ChangeLog +++ b/sys-apps/pcmcia-cs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/pcmcia-cs # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.100 2005/08/14 10:02:07 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.101 2005/10/22 16:01:23 brix Exp $ + + 22 Oct 2005; Henrik Brix Andersen <brix@gentoo.org> + -files/pcmcia-cs-3.2.7-move-pnp-ids-to-usr-share-misc.patch, + -files/pcmcia-cs-3.2.8-includes.patch, -pcmcia-cs-3.2.8.ebuild, + pcmcia-cs-3.2.8-r2.ebuild: + Always build with GTK+-2 support with USE=gtk, bug #106560. 14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> pcmcia-cs-3.2.8-r2.ebuild: diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.8 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.8 deleted file mode 100644 index 5cc9da5c0ea4..000000000000 --- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.8 +++ /dev/null @@ -1 +0,0 @@ -MD5 0d6d65be8896eff081aee996049afaa5 pcmcia-cs-3.2.8.tar.gz 1271846 diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.7-move-pnp-ids-to-usr-share-misc.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.7-move-pnp-ids-to-usr-share-misc.patch deleted file mode 100644 index 67309723db42..000000000000 --- a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.7-move-pnp-ids-to-usr-share-misc.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -urN pcmcia-cs-3.2.7.orig/debug-tools/Makefile pcmcia-cs-3.2.7/debug-tools/Makefile ---- pcmcia-cs-3.2.7.orig/debug-tools/Makefile 2004-08-30 14:16:45.902884696 -0500 -+++ pcmcia-cs-3.2.7/debug-tools/Makefile 2004-08-30 14:21:01.933962056 -0500 -@@ -66,7 +66,7 @@ - ifdef CONFIG_PNP_BIOS - cp -f lspnp setpnp $(PREFIX)/sbin - @mkdir -p $(PREFIX)/usr/share -- cp -f pnp.ids $(PREFIX)/usr/share -+ cp -f pnp.ids $(PREFIX)/usr/share/misc - endif - - include ../rules.mk -diff -urN pcmcia-cs-3.2.7.orig/debug-tools/lspnp.c pcmcia-cs-3.2.7/debug-tools/lspnp.c ---- pcmcia-cs-3.2.7.orig/debug-tools/lspnp.c 2004-08-30 14:16:45.912883176 -0500 -+++ pcmcia-cs-3.2.7/debug-tools/lspnp.c 2004-08-30 14:21:15.193946232 -0500 -@@ -154,7 +154,7 @@ - char s[133], *t; - int n; - struct eisa_id *id; -- FILE *f = fopen("/usr/share/pnp.ids", "r"); -+ FILE *f = fopen("/usr/share/misc/pnp.ids", "r"); - - if (f == NULL) - return; -diff -urN pcmcia-cs-3.2.7.orig/man/lspnp.8 pcmcia-cs-3.2.7/man/lspnp.8 ---- pcmcia-cs-3.2.7.orig/man/lspnp.8 2004-08-30 14:16:45.918882264 -0500 -+++ pcmcia-cs-3.2.7/man/lspnp.8 2004-08-30 14:21:26.814179688 -0500 -@@ -36,8 +36,8 @@ - .B \-v - Selects more verbose output. Can be used more than once. - .SH FILES --.TP \w'/usr/share/pnp.ids\ \ \ \ |\|'u --/usr/share/pnp.ids -+.TP \w'/usr/share/misc/pnp.ids\ \ \ \ |\|'u -+/usr/share/misc/pnp.ids - A database of known Plug and Play device ID's. - .TP - /proc/bus/pnp/... diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-includes.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-includes.patch deleted file mode 100644 index c30eabe8aa83..000000000000 --- a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur pcmcia-cs-3.2.8/Configure pcmcia-cs-3.2.8-includes/Configure ---- pcmcia-cs-3.2.8/Configure 2004-07-13 09:33:31.000000000 +0200 -+++ pcmcia-cs-3.2.8-includes/Configure 2005-04-13 01:18:55.000000000 +0200 -@@ -853,7 +853,7 @@ - - if [ "$CONFIG_PCMCIA" = "y" ] ; then - # Use our kernel config, then kernel headers, then our headers -- CPPFLAGS="-I../include/static -I\$(LINUX)/include -I../include" -+ CPPFLAGS="-I../include/static -I../include -I\$(LINUX)/include" - else - # Use our kernel config and headers, then kernel headers - CPPFLAGS="-I../include -I\$(LINUX)/include" 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 diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild deleted file mode 100644 index 2aed04408aa6..000000000000 --- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# 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.ebuild,v 1.11 2005/07/07 10:47:47 brix Exp $ - -inherit eutils flag-o-matic toolchain-funcs linux-info - -DESCRIPTION="PCMCIA tools for Linux" -HOMEPAGE="http://pcmcia-cs.sourceforge.net" -SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc x86" - -IUSE="gtk gtk2 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* ) ) - xforms? ( x11-libs/xforms ) )" -DEPEND="${RDEPEND} - virtual/linux-sources - >=sys-apps/sed-4" -PROVIDE="virtual/pcmcia" - -pkg_setup() { - linux-info_pkg_setup - - if kernel_is lt 2 5 && linux_chkconfig_present PCMCIA; then - ewarn - ewarn "The recommended configuration for linux-2.4.x is to disable" - ewarn "CONFIG_PCMCIA in the kernel and use the drivers from" - ewarn "sys-apps/pcmcia-cs-modules." - ewarn - elif kernel_is gt 2 4 && ! (linux_chkconfig_present PCMCIA || linux_chkconfig_present PCCARD); then - eerror - eerror "The package requires the in-kernel PCMCIA drivers to be enabled" - eerror "for kernel 2.6.x." - eerror - die "linux-${KV_FULL} without PCMCIA support detected" - fi -} - - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/${P}-gcc4.patch - epatch ${FILESDIR}/${P}-includes.patch - epatch ${FILESDIR}/${P}-ldflags.patch - epatch ${FILESDIR}/${P}-move-pnp-ids.patch - epatch ${FILESDIR}/${P}-x11.patch - epatch ${FILESDIR}/${P}-tools-only.patch - - sed -i -e 's:usr/man:usr/share/man:g' ${S}/Configure -} - -src_compile() { - local config CONFIG_FILE - - if use trusted; then - ewarn "Unsafe user-space tools enabled" - config="${config} --trust" - else - einfo "Unsafe user-space tools disabled" - config="${config} --notrust" - fi - - if linux_chkconfig_present PNP; then - einfo "Plug and Play support enabled" - config="${config} --pnp" - else - einfo "Plug and Play support disabled" - config="${config} --nopnp" - fi - - # cardctl, cardinfo and xcardinfo are setUID - append-ldflags -Wl,-z,now - - ${S}/Configure \ - --noprompt \ - --kernel=${KV_DIR} \ - --target=${D} \ - --arch=$(tc-arch-kernel) \ - --ucc=$(tc-getCC) \ - --kcc=$(tc-getCC) \ - --ld=$(tc-getLD) \ - --uflags="${CFLAGS}" \ - --kflags="$(getfilevar HOSTCFLAGS ${KV_DIR}/Makefile)" \ - --srctree \ - --nox11 \ - ${config} \ - || die "Configure failed" - - # config file to be altered - CONFIG_FILE="${S}/config.mk" - - if use X; then - echo "HAS_XAW=y" >> ${CONFIG_FILE} - - 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 - fi - - if use xforms; then - echo "FLIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lforms -lX11 -lm -lXpm" >> ${CONFIG_FILE} - echo "HAS_FORMS=y" >> ${CONFIG_FILE} - fi - fi - - emake all || die "emake all failed" -} - -src_install () { - emake install || die "emake install failed" - - # Gentoo specific rc-scripts - rm -rf ${D}/etc/rc*.d - newconfd ${FILESDIR}/${P}-conf.d pcmcia - newinitd ${FILESDIR}/${P}-init.d pcmcia - - # Gentoo specific network script - exeinto /etc/pcmcia - newexe ${FILESDIR}/${P}-network network - - # remove bogus modules.conf file - rm -f ${D}/etc/modules.conf - - # remove empty directory structure - rm -rf ${D}/var - - if [[ "${ARCH}" = "ppc" ]]; then - insinto /etc/pcmcia - newins ${FILESDIR}/${P}-ppc.config.opts config.opts - fi - - dodoc BUGS CHANGES MAINTAINERS README README-2.4 \ - SUPPORTED.CARDS doc/* -} |