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

Collapse All | Expand All

(-)/usr/portage/app-admin/webalizer/webalizer-2.01.10-r11.ebuild (-12 / +4 lines)
Lines 18-24 Link Here
18
KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
18
KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
19
IUSE="apache2 geoip nls"
19
IUSE="apache2 geoip nls"
20
20
21
DEPEND="=sys-libs/db-4.1*
21
DEPEND="!geoip? ( =sys-libs/db-4.2* )
22
	>=sys-libs/zlib-1.1.4
22
	>=sys-libs/zlib-1.1.4
23
	>=media-libs/libpng-1.2
23
	>=media-libs/libpng-1.2
24
	>=media-libs/gd-1.8.3
24
	>=media-libs/gd-1.8.3
Lines 45-62 Link Here
45
src_unpack() {
45
src_unpack() {
46
	unpack ${A} ; cd ${S}
46
	unpack ${A} ; cd ${S}
47
47
48
	sed -i -e "s,db_185.h,db.h," configure
49
50
	# geoip patch messes up db4.1 patch, so both are dependent on geoip USE
51
	# flag, even though both of the db patches do the _exact_ same thing
52
	if use geoip; then
48
	if use geoip; then
53
		cd ${WORKDIR}
54
		epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die
49
		epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die
55
		cd ${S}
56
		epatch ${FILESDIR}/${PN}-db4-with-geoip.patch || die
57
	else
50
	else
58
		epatch ${FILESDIR}/${PN}-readability.patch || die
59
		epatch ${FILESDIR}/${PN}-db4.patch || die
51
		epatch ${FILESDIR}/${PN}-db4.patch || die
52
		epatch ${FILESDIR}/${PN}-readability.patch || die
60
	fi
53
	fi
61
}
54
}
62
55
Lines 85-93 Link Here
85
	# stupid broken configuration file
78
	# stupid broken configuration file
86
	autoconf
79
	autoconf
87
80
88
	econf \
81
	# --with-db not needed, since db-ebuilds provide links
89
		--with-db=/usr/include/db4.1/ \
82
	econf ${myconf} || die "econf failed"
90
		${myconf} || die "econf failed"
91
83
92
	emake || die "make failed"
84
	emake || die "make failed"
93
}
85
}

Return to bug 101065