Attachment #293921 for bug #392067

View | Details | Raw Unified | Return to bug 392067
Collapse All | Expand All

Lines 2-7 Link Here

(-)a/ChangeLog (+3 lines)
2	# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2	2	# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
3	# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.127 2011/11/27 04:40:49 radhermit Exp $	3	# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.127 2011/11/27 04:40:49 radhermit Exp $
4		4
		5	27 Nov 2011; Michał Górny <mgorny@gentoo.org> geoip-1.4.8.ebuild:
		6	Fix invalid use of autotools-utils eclass.
		7
5	27 Nov 2011; Tim Harder <radhermit@gentoo.org> geoip-1.4.8.ebuild:	8	27 Nov 2011; Tim Harder <radhermit@gentoo.org> geoip-1.4.8.ebuild:
6	Build in the source tree.	9	Build in the source tree.
7		10




-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

AUX geoipupdate.sh 713 RMD160 bd0c4d6e4c58bb7a9aba7ec7b61ee8c991ee7de1 SHA1 544f692439aad0c5825f23d9cfbbac751facd1c2 SHA256 a7ba219827a708dcc8288275a9dc27fbf6995d147d09012105bac08586a0c0a3
DIST GeoIP-1.4.8.tar.gz 1074829 RMD160 51388ff9c738c9e4d60fff790b7d7599a7133bf5 SHA1 7bafb9918e3c35a6ccc71bb14945245d45c4b796 SHA256 cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4
DIST GeoIPv6.dat.gz 757472 RMD160 178fb259d5fe7158a49c32a9b72d91372cb2d8a5 SHA1 98894197992ef1022bf27d612eda009672ccf46d SHA256 75f63ca4db6909b01ece94e3462048eb2a836f67b9d09548443d45294a938d52
EBUILD geoip-1.4.8.ebuild 1439 RMD160 321593f6f508c1b43fc80a17fee5290c4ffbf919 SHA1 71bdad199d2577e48a141699274df18a23444423 SHA256 9afde3c1ac9a3cb9eea9b35b194d7fdc34a8e971acf15b5d2558d8c1c76c155a
MISC ChangeLog 15618 RMD160 db6237c6b1e1edddc09423092f7fa682419bfe3d SHA1 720bbfdc05eb2874968a1cc59abece4938c20821 SHA256 6b2dcd08e4462a3ae9c38a20ffec05026694c9e4c59b46cef50fdb4e0bba21ae
MISC metadata.xml 467 RMD160 bae585df5c7d12c765d5fab1b7766b79729f1144 SHA1 dfe6076a08817ef8058f1209c381d61f4aaac998 SHA256 3081b13432bfa3cc218fe7f9ade8fe1cd0fcbea4f3f1de2d51faf8a0acad88f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)

iJwEAQEIAAYFAk7SAFQACgkQfXuS5UK5QB1x1gQAsdJ/Aiatx3wlaq9IosAQh9wc
TPdIMs4gyvCP5PghkbeasySaiwAb+iz2V2DmeBuWMB2k2tQ5ZF/38kQiG8VuFdot
Iqb2mQ0xbe60b6C7HoG+dM2ZH/xIe7mtUdDQ5cbcsOT+rcyJvIFX8Vr1M4s0qerF
uaNApK0qLc3SsJdHZcc=
=482W
m9kKx3MP3yvIfMMAlTOYYZNatWk0qdVSZixctb26jVi8y8/cyRKBDTSwNvC6Slc=
=C8iA
-----END PGP SIGNATURE-----




	)
"

AUTOTOOLS_IN_SOURCE_BUILD=1

S=${WORKDIR}/${MY_P}

src_prepare() {

		-e "s:usr local etc:etc:" \
		-i apps/geoipupdate-pureperl.pl || die

	autotools-utils_src_prepare
	eautoreconf
}

src_configure() {
	econf $(use_enable static-libs static)
}

src_install() {
	autotools-utils_src_install

	use perl-geoipupdate && dobin apps/geoipupdate-pureperl.pl
	dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default
	rm -f "${ED}/etc/GeoIP.conf.default"
	use static-libs || remove_libtool_files

	if use ipv6; then
		insinto /usr/share/GeoIP
		doins "${WORKDIR}/GeoIPv6.dat"
	fi

	dosbin "${FILESDIR}/geoipupdate.sh"
- 

Return to bug 392067

Lines 1-20 Link Here

(-)a/Manifest (-10 / +8 lines)
1	-----BEGIN PGP SIGNED MESSAGE-----	1	-----BEGIN PGP SIGNED MESSAGE-----
2	Hash: SHA512	2	Hash: SHA256
3		3
4	AUX geoipupdate.sh 713 RMD160 bd0c4d6e4c58bb7a9aba7ec7b61ee8c991ee7de1 SHA1 544f692439aad0c5825f23d9cfbbac751facd1c2 SHA256 a7ba219827a708dcc8288275a9dc27fbf6995d147d09012105bac08586a0c0a3	4	AUX geoipupdate.sh 713 RMD160 bd0c4d6e4c58bb7a9aba7ec7b61ee8c991ee7de1 SHA1 544f692439aad0c5825f23d9cfbbac751facd1c2 SHA256 a7ba219827a708dcc8288275a9dc27fbf6995d147d09012105bac08586a0c0a3
5	DIST GeoIP-1.4.8.tar.gz 1074829 RMD160 51388ff9c738c9e4d60fff790b7d7599a7133bf5 SHA1 7bafb9918e3c35a6ccc71bb14945245d45c4b796 SHA256 cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4	5	DIST GeoIP-1.4.8.tar.gz 1074829 RMD160 51388ff9c738c9e4d60fff790b7d7599a7133bf5 SHA1 7bafb9918e3c35a6ccc71bb14945245d45c4b796 SHA256 cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4
6	DIST GeoIPv6.dat.gz 757472 RMD160 178fb259d5fe7158a49c32a9b72d91372cb2d8a5 SHA1 98894197992ef1022bf27d612eda009672ccf46d SHA256 75f63ca4db6909b01ece94e3462048eb2a836f67b9d09548443d45294a938d52	6	DIST GeoIPv6.dat.gz 757472 RMD160 178fb259d5fe7158a49c32a9b72d91372cb2d8a5 SHA1 98894197992ef1022bf27d612eda009672ccf46d SHA256 75f63ca4db6909b01ece94e3462048eb2a836f67b9d09548443d45294a938d52
7	EBUILD geoip-1.4.8.ebuild 1524 RMD160 a3d346e4fe1b76cba421c88e850f3aaf37fc95c0 SHA1 e37a4d7d661ad7ea4e9de36a5adca2ec191e6d2b SHA256 acbc35c6f0b58dd13a5f607e3826df69ccba4867ad0d60164f63a93bf2e77e66	7	EBUILD geoip-1.4.8.ebuild 1439 RMD160 321593f6f508c1b43fc80a17fee5290c4ffbf919 SHA1 71bdad199d2577e48a141699274df18a23444423 SHA256 9afde3c1ac9a3cb9eea9b35b194d7fdc34a8e971acf15b5d2558d8c1c76c155a
8	MISC ChangeLog 15502 RMD160 ea5da781a0e500801736826d89518a44fe0fb386 SHA1 b216116d7811d549a4de3742d05865b43f047509 SHA256 44532c782d1194b9508f6665900b04ff7022ec28c5d61f42c4e57cb644720945	8	MISC ChangeLog 15618 RMD160 db6237c6b1e1edddc09423092f7fa682419bfe3d SHA1 720bbfdc05eb2874968a1cc59abece4938c20821 SHA256 6b2dcd08e4462a3ae9c38a20ffec05026694c9e4c59b46cef50fdb4e0bba21ae
9	MISC metadata.xml 467 RMD160 bae585df5c7d12c765d5fab1b7766b79729f1144 SHA1 dfe6076a08817ef8058f1209c381d61f4aaac998 SHA256 3081b13432bfa3cc218fe7f9ade8fe1cd0fcbea4f3f1de2d51faf8a0acad88f5	9	MISC metadata.xml 467 RMD160 bae585df5c7d12c765d5fab1b7766b79729f1144 SHA1 dfe6076a08817ef8058f1209c381d61f4aaac998 SHA256 3081b13432bfa3cc218fe7f9ade8fe1cd0fcbea4f3f1de2d51faf8a0acad88f5
10	-----BEGIN PGP SIGNATURE-----	10	-----BEGIN PGP SIGNATURE-----
11	Version: GnuPG v2.0.18 (GNU/Linux)	11	Version: GnuPG v2.0.18 (GNU/Linux)
12		12
13	iQEcBAEBCgAGBQJO0b9XAAoJEEqz6FtPBkyjtMAIAKyLN68QyubhqpIi5cEhxZTZ	13	iJwEAQEIAAYFAk7SAFQACgkQfXuS5UK5QB1x1gQAsdJ/Aiatx3wlaq9IosAQh9wc
14	RMqe+BYRuiXeQOruriJqLI6f4gpBGppglkTojURG4S2grP6UdMAGfN0AweSkan1s	14	TPdIMs4gyvCP5PghkbeasySaiwAb+iz2V2DmeBuWMB2k2tQ5ZF/38kQiG8VuFdot
15	qOFw+PScUeI6pIoW0Y9SZUXfj5vvs1iCYhrmB6I+lMQ+KCJ8uNrb/MrEGlkdCpER	15	Iqb2mQ0xbe60b6C7HoG+dM2ZH/xIe7mtUdDQ5cbcsOT+rcyJvIFX8Vr1M4s0qerF
16	uPQRbv2kj5Tg4bBuOU/THsUOq5OsWU5OcMi/cYMV/HvBbcUfoEpLSpTISDctCoZz	16	uaNApK0qLc3SsJdHZcc=
17	qj4uTQsP3X3zYU795lGMnQxoyv9PHeXPX0eMpBSmzZIyKChwRK4DEs4NKo/QqZvd	17	=482W
18	m9kKx3MP3yvIfMMAlTOYYZNatWk0qdVSZixctb26jVi8y8/cyRKBDTSwNvC6Slc=
19	=C8iA
20	-----END PGP SIGNATURE-----	18	-----END PGP SIGNATURE-----

Lines 28-35 RDEPEND=" Link Here

(-)a/geoip-1.4.8.ebuild (-11 / +5 lines)
28	)	28	)
29	"	29	"
30		30
31	AUTOTOOLS_IN_SOURCE_BUILD=1
32
33	S=${WORKDIR}/${MY_P}	31	S=${WORKDIR}/${MY_P}
34		32
35	src_prepare() {	33	src_prepare() {
Lines 37-59 src_prepare() { Link Here
37	-e "s:usr local etc:etc:" \	35	-e "s:usr local etc:etc:" \
38	-i apps/geoipupdate-pureperl.pl \|\| die	36	-i apps/geoipupdate-pureperl.pl \|\| die
39		37
		38	autotools-utils_src_prepare
40	eautoreconf	39	eautoreconf
41	}	40	}
42		41
43	src_configure() {
44	econf $(use_enable static-libs static)
45	}
46
47	src_install() {	42	src_install() {
48	default	43	autotools-utils_src_install
		44
49	use perl-geoipupdate && dobin apps/geoipupdate-pureperl.pl	45	use perl-geoipupdate && dobin apps/geoipupdate-pureperl.pl
50	dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default	46	dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default
51	rm "${ED}/etc/GeoIP.conf.default"	47	rm -f "${ED}/etc/GeoIP.conf.default"
52	use static-libs \|\| remove_libtool_files
53		48
54	if use ipv6; then	49	if use ipv6; then
55	insinto /usr/share/GeoIP	50	insinto /usr/share/GeoIP
56	doins "${WORKDIR}/GeoIPv6.dat" \|\| die	51	doins "${WORKDIR}/GeoIPv6.dat"
57	fi	52	fi
58		53
59	dosbin "${FILESDIR}/geoipupdate.sh"	54	dosbin "${FILESDIR}/geoipupdate.sh"
60	-