From ce814b8cf7f34921123ac35891f8fdafd6ade5a4 Mon Sep 17 00:00:00 2001 From: Jeremy Olexa Date: Fri, 14 Oct 2011 11:53:04 -0500 Subject: [www-misc/mirrorbrain] misc WIP fixes --- www-misc/mirrorbrain/Manifest | 2 +- www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'www-misc/mirrorbrain') diff --git a/www-misc/mirrorbrain/Manifest b/www-misc/mirrorbrain/Manifest index 585de1e..be37b35 100644 --- a/www-misc/mirrorbrain/Manifest +++ b/www-misc/mirrorbrain/Manifest @@ -1,5 +1,5 @@ AUX mirrorbrain.conf.dist 283 RMD160 75e1d9b143df9d65b280ae6033d5421c03f64720 SHA1 fe724636efcfc6be74a583d159925ba99670d874 SHA256 f0128c5596b37b92b08b1ddde850f7aa68a29cccee7265bfa4d0beb2beb1c142 DIST mirrorbrain-2.15.1.tar.gz 406558 RMD160 a85df3731780b5d76fa89eff0f1112b7163ee0ed SHA1 53feeb62407965fe9672cb2600a43cc3620d0971 SHA256 40ffceab04ef109f3e48d3760265595ed02100198768660e002322927739d462 -EBUILD mirrorbrain-2.15.1.ebuild 1718 RMD160 e301499efb6443c91bbeeb1bc1dc9c637f5efe07 SHA1 a83f7eb9591bfc01649e17d80d9724cece253bbe SHA256 d2489c47447f93879b1656112d72e7237a0a0e107089322ecd812956b4049693 +EBUILD mirrorbrain-2.15.1.ebuild 1929 RMD160 980311bce25fab8ba565c5ff17d6c59ed342a5cf SHA1 e54537fe69b32bd9866850b213e61424f15a2a8f SHA256 e6fb3da86aff9972e3b1a6bd364e3360e99dab3581a805f7c00495413aa2acde MISC ChangeLog 684 RMD160 b19fe5f184e8c13d38c09643d4875c549178d805 SHA1 1e71151c72721e816915b51bc548f169236a66ae SHA256 9f1a8d34facba936c11a1bad5d31d6076936d36563014ffa1359ee2ba265dc87 MISC metadata.xml 572 RMD160 5b7aa04b3fb08e0fbb6a09cc9afff20d71665fc7 SHA1 2eb146a7c8554a0559c2e034ee6f14efe357e65e SHA256 bd97a6cb6d478f88d4b367bb7f5dd8de0f1d53b7a4dcca1bc484c9fabdb25308 diff --git a/www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild b/www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild index 7742ed0..6625855 100644 --- a/www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild +++ b/www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" - +EAPI="3" +PYTHON_DEPEND="2" inherit distutils eutils MY_PN="mirrorbrain" @@ -39,12 +39,16 @@ pkg_setup() { enewuser mirrorbrain -1 -1 /dev/null mirrorbrain } +src_prepare() { + sed -i -e 's:/var/lib/GeoIP/GeoLiteCity.dat:/usr/share/GeoIP/GeoIP.dat:' ${S}/tools/geoiplookup_city.c || die + sed -i -e 's:/var/lib/GeoIP/GeoIP.dat:/usr/share/GeoIP/GeoIP.dat:' ${S}/tools/geoiplookup_continent.c || die +} src_compile() { tc-export CC cd tools ${CC} -Wall -fPIC -lGeoIP -o geoiplookup_continent geoiplookup_continent.c ${CC} -Wall -fPIC -lGeoIP -o geoiplookup_city geoiplookup_city.c - cd ../mirrordoctor + cd ../mb distutils_src_compile } @@ -56,16 +60,16 @@ src_install() { # install misc files/scripts newbin mirrorprobe/mirrorprobe.py mirrorprobe + dobin tools/{geoiplookup_continent,geoiplookup_city} + dobin tools/geoip-lite-update + newbin ${S}/tools/scanner.pl scanner insinto /usr/share/"${PN}" doins -r sql doins -r tools - rm "${D}"/usr/share/"${PN}"/tools/*.c - # install mirrordoctor - cd mirrordoctor + rm "${D}"/usr/share/"${PN}"/tools/geoiplookup_* + + cd mb distutils_src_install - doins -r famfamfam_flag_icons - mv "${D}"/usr/bin/mirrordoctor.py "${D}"/usr/bin/mirrordoctor - dosym /usr/bin/mirrordoctor /usr/bin/mb # config files insinto /etc -- cgit v1.2.3-65-gdbad