Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 311529 | Differences between
and this patch

Collapse All | Expand All

(-)lcd4linux.orig/lcd4linux-0.10.1_rc2-r2.ebuild (-8 / +9 lines)
Lines 2-9 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild,v 1.8 2010/03/05 23:26:14 ssuominen Exp $
3
# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild,v 1.8 2010/03/05 23:26:14 ssuominen Exp $
4
4
5
EAPI="3"
5
WANT_AUTOMAKE="1.9"
6
WANT_AUTOMAKE="1.9"
6
inherit eutils multilib autotools
7
inherit eutils multilib autotools python
7
8
8
MY_P=${P/_rc/-RC}
9
MY_P=${P/_rc/-RC}
9
10
Lines 39-45 Link Here
39
	python? ( dev-lang/python )
40
	python? ( dev-lang/python )
40
	iconv?  ( virtual/libiconv )
41
	iconv?  ( virtual/libiconv )
41
	mpd?    ( media-libs/libmpd )
42
	mpd?    ( media-libs/libmpd )
42
43
	python? ( =dev-lang/python-2* )
43
	lcd_devices_bwct?     ( =virtual/libusb-0* )
44
	lcd_devices_bwct?     ( =virtual/libusb-0* )
44
	lcd_devices_g15?      ( =virtual/libusb-0* )
45
	lcd_devices_g15?      ( =virtual/libusb-0* )
45
	lcd_devices_lcd2usb?  ( =virtual/libusb-0* )
46
	lcd_devices_lcd2usb?  ( =virtual/libusb-0* )
Lines 59-64 Link Here
59
S="${WORKDIR}/${MY_P}"
60
S="${WORKDIR}/${MY_P}"
60
61
61
pkg_setup() {
62
pkg_setup() {
63
	python_set_active_version 2
62
	echo
64
	echo
63
	elog "If you wish to compile only specific plugins, please use"
65
	elog "If you wish to compile only specific plugins, please use"
64
	elog "the LCD4LINUX_PLUGINS environment variable. Plugins must be comma separated and can be either of:"
66
	elog "the LCD4LINUX_PLUGINS environment variable. Plugins must be comma separated and can be either of:"
Lines 66-84 Link Here
66
	echo
68
	echo
67
}
69
}
68
70
69
src_unpack() {
71
src_prepare() {
70
	unpack ${A}
71
	cd "${S}"
72
73
	epatch "${FILESDIR}/${P}-warnings.patch"
72
	epatch "${FILESDIR}/${P}-warnings.patch"
74
	epatch "${FILESDIR}/${P}-mpd.patch"
73
	epatch "${FILESDIR}/${P}-mpd.patch"
75
	epatch "${FILESDIR}/${P}-nordtsc.patch"
74
	epatch "${FILESDIR}/${P}-nordtsc.patch"
76
	epatch "${FILESDIR}/${P}-autoconf-2.65.patch"
75
	epatch "${FILESDIR}/${P}-autoconf-2.65.patch"
77
76
	epatch "${FILESDIR}/${PN}"-header.patch || die
78
	eautoreconf
77
	eautoreconf
79
}
78
}
80
79
81
src_compile() {
80
src_configure() {
82
	# This array contains the driver names required by configure --with-drivers=
81
	# This array contains the driver names required by configure --with-drivers=
83
	# The positions must be the same as the corresponding use_expand flags
82
	# The positions must be the same as the corresponding use_expand flags
84
	local DEVICE_DRIVERS=(BeckmannEgle BWCT CrystalFontz Curses Cwlinux
83
	local DEVICE_DRIVERS=(BeckmannEgle BWCT CrystalFontz Curses Cwlinux
Lines 153-159 Link Here
153
		|| die "econf failed"
152
		|| die "econf failed"
154
153
155
	sed -i.orig -e 's/-L -lX11/ -lX11 /g' Makefile || die "sed fixup failed"
154
	sed -i.orig -e 's/-L -lX11/ -lX11 /g' Makefile || die "sed fixup failed"
155
}
156
156
157
src_compile() {
157
	emake || die "make failed"
158
	emake || die "make failed"
158
}
159
}
159
160
(-)lcd4linux.c (-1 / +1 lines)
Lines 26-32 Link Here
26
 */
26
 */
27
27
28
#include "config.h"
28
#include "config.h"
29
29
#include <sys/stat.h>
30
#include <stdlib.h>
30
#include <stdlib.h>
31
#include <stdio.h>
31
#include <stdio.h>
32
#include <string.h>
32
#include <string.h>

Return to bug 311529