public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/darkside:master commit in: www-misc/mirrorbrain/
@ 2011-10-12 22:40 Jeremy Olexa
  0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa @ 2011-10-12 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     15a8ea6abf2c3909ab86cc64e57d31fc274c7794
Author:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 22:39:51 2011 +0000
Commit:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 22:39:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=15a8ea6a

manifest

---
 www-misc/mirrorbrain/Manifest |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/www-misc/mirrorbrain/Manifest b/www-misc/mirrorbrain/Manifest
index ca049a4..585de1e 100644
--- a/www-misc/mirrorbrain/Manifest
+++ b/www-misc/mirrorbrain/Manifest
@@ -1,20 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mirrorbrain.conf.dist 283 RMD160 75e1d9b143df9d65b280ae6033d5421c03f64720 SHA1 fe724636efcfc6be74a583d159925ba99670d874 SHA256 f0128c5596b37b92b08b1ddde850f7aa68a29cccee7265bfa4d0beb2beb1c142
-DIST mirrorbrain-2.11.3.tar.gz 356242 RMD160 138bad4b52622e93069640414fee3fee365e135f SHA1 bb9f02aca01d6b1494f6067dd2bff1125c092e7d SHA256 cf18c3863f064463413744c4a537b3180bbbfbfd27d69a313236498a898af03e
-DIST mirrorbrain-2.8.1.tar.gz 308537 RMD160 5f3a1dc08c005e7151b7bba9030e08e1b18ed39b SHA1 929c9bd427b9d5d9b9aaf9bc256a20d08516ea27 SHA256 999262154d672e8c2339cbf67ec5ed9cf654a5767473893c91894b742c8f6bf5
-DIST mirrorbrain-2.8.tar.gz 307722 RMD160 83fccfc8bff5a9c07d38407b44681135c3741bb9 SHA1 79470b1c46b6fb861001e7ff9c903f41948eb8e8 SHA256 204ea49097da5502443d7f8a5f34181667486de6c0be227da7e4524cba146125
-EBUILD mirrorbrain-2.11.3.ebuild 1718 RMD160 e301499efb6443c91bbeeb1bc1dc9c637f5efe07 SHA1 a83f7eb9591bfc01649e17d80d9724cece253bbe SHA256 d2489c47447f93879b1656112d72e7237a0a0e107089322ecd812956b4049693
-EBUILD mirrorbrain-2.8.1.ebuild 1666 RMD160 7eb8b45f6bb8aa6fcceea51a171cb51b34118f76 SHA1 fbe58c7ae80b7997e82bd8b81e284b59a33bc517 SHA256 ab68815f9710cadab95d9e609067ace4389af7332018a7cd91b480d50ee74ab6
-EBUILD mirrorbrain-2.8.ebuild 1666 RMD160 7eb8b45f6bb8aa6fcceea51a171cb51b34118f76 SHA1 fbe58c7ae80b7997e82bd8b81e284b59a33bc517 SHA256 ab68815f9710cadab95d9e609067ace4389af7332018a7cd91b480d50ee74ab6
-EBUILD mirrorbrain-9999.ebuild 1710 RMD160 c8a928b832259763169073bde30d9b3debfc6ee9 SHA1 26936a0e7b859a712fa814d3ab9e8b6d6642b2e9 SHA256 b42ec2f84bf698adaf8a7a82250a71ceb17fdcbe8b624ac60e3ffa3618af79b5
+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
 MISC ChangeLog 684 RMD160 b19fe5f184e8c13d38c09643d4875c549178d805 SHA1 1e71151c72721e816915b51bc548f169236a66ae SHA256 9f1a8d34facba936c11a1bad5d31d6076936d36563014ffa1359ee2ba265dc87
 MISC metadata.xml 572 RMD160 5b7aa04b3fb08e0fbb6a09cc9afff20d71665fc7 SHA1 2eb146a7c8554a0559c2e034ee6f14efe357e65e SHA256 bd97a6cb6d478f88d4b367bb7f5dd8de0f1d53b7a4dcca1bc484c9fabdb25308
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iD8DBQFLKeA/QW+hXSf0t0IRAsEVAJ94B1L2KXKMIsQHXw04+wmHM8NxSACfTqBR
-Tfp7F7l0FIUcZOQUJdWkIr8=
-=ECPT
------END PGP SIGNATURE-----



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] dev/darkside:master commit in: www-misc/mirrorbrain/
@ 2011-10-14 16:53 Jeremy Olexa
  0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa @ 2011-10-14 16:53 UTC (permalink / raw
  To: gentoo-commits

commit:     ce814b8cf7f34921123ac35891f8fdafd6ade5a4
Author:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 16:53:04 2011 +0000
Commit:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 16:53:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=ce814b8c

[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(-)

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



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] dev/darkside:master commit in: www-misc/mirrorbrain/
@ 2011-10-12 22:33 Jeremy Olexa
  0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa @ 2011-10-12 22:33 UTC (permalink / raw
  To: gentoo-commits

commit:     1842c0a9f3c74445821c9d420b3d5fd56f84fe55
Author:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 22:33:07 2011 +0000
Commit:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 22:33:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=1842c0a9

[www-misc/mirrorbrain] cleanup and bump

---
 ...ain-2.11.3.ebuild => mirrorbrain-2.15.1.ebuild} |    0
 www-misc/mirrorbrain/mirrorbrain-2.8.1.ebuild      |   72 -------------------
 www-misc/mirrorbrain/mirrorbrain-2.8.ebuild        |   72 -------------------
 www-misc/mirrorbrain/mirrorbrain-9999.ebuild       |   73 --------------------
 4 files changed, 0 insertions(+), 217 deletions(-)

diff --git a/www-misc/mirrorbrain/mirrorbrain-2.11.3.ebuild b/www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild
similarity index 100%
rename from www-misc/mirrorbrain/mirrorbrain-2.11.3.ebuild
rename to www-misc/mirrorbrain/mirrorbrain-2.15.1.ebuild

diff --git a/www-misc/mirrorbrain/mirrorbrain-2.8.1.ebuild b/www-misc/mirrorbrain/mirrorbrain-2.8.1.ebuild
deleted file mode 100644
index 558b307..0000000
--- a/www-misc/mirrorbrain/mirrorbrain-2.8.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit distutils eutils
-
-MY_PN="mirrorbrain"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Download Redirector and Metalink Generator"
-HOMEPAGE="http://mirrorbrain.org"
-SRC_URI="http://mirrorbrain.org/files/releases/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-SLOT="0"
-
-DEPEND="dev-libs/geoip
-	=www-apache/mod_autoindex_mb-${PV}
-	=www-apache/mod_mirrorbrain-${PV}
-	www-apache/mod_form
-	dev-python/psycopg
-	dev-perl/DBD-Pg
-	dev-python/sqlobject
-	dev-perl/Config-IniFiles
-	dev-perl/Digest-MD4
-	dev-perl/libwww-perl
-	dev-python/cmdln"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup mirrorbrain
-	enewuser mirrorbrain -1 -1 /dev/null mirrorbrain
-}
-
-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
-	distutils_src_compile
-}
-
-src_install() {
-	# install docs
-	dodoc ABOUT BUGS FAQ INSTALL NEWS TODO THANKS
-
-	# install misc files/scripts
-	newbin mirrorprobe/mirrorprobe.py mirrorprobe
-	insinto /usr/share/"${PN}"
-	doins -r sql
-	doins -r tools
-	rm "${D}"/usr/share/"${PN}"/tools/*.c
-	# install mirrordoctor
-	cd mirrordoctor
-	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
-	doins "${FILESDIR}"/mirrorbrain.conf.dist
-	fperms 0640 /etc/mirrorbrain.conf.dist
-	fowners root:mirrorbrain /etc/mirrorbrain.conf.dist
-}

diff --git a/www-misc/mirrorbrain/mirrorbrain-2.8.ebuild b/www-misc/mirrorbrain/mirrorbrain-2.8.ebuild
deleted file mode 100644
index 558b307..0000000
--- a/www-misc/mirrorbrain/mirrorbrain-2.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit distutils eutils
-
-MY_PN="mirrorbrain"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Download Redirector and Metalink Generator"
-HOMEPAGE="http://mirrorbrain.org"
-SRC_URI="http://mirrorbrain.org/files/releases/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-SLOT="0"
-
-DEPEND="dev-libs/geoip
-	=www-apache/mod_autoindex_mb-${PV}
-	=www-apache/mod_mirrorbrain-${PV}
-	www-apache/mod_form
-	dev-python/psycopg
-	dev-perl/DBD-Pg
-	dev-python/sqlobject
-	dev-perl/Config-IniFiles
-	dev-perl/Digest-MD4
-	dev-perl/libwww-perl
-	dev-python/cmdln"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup mirrorbrain
-	enewuser mirrorbrain -1 -1 /dev/null mirrorbrain
-}
-
-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
-	distutils_src_compile
-}
-
-src_install() {
-	# install docs
-	dodoc ABOUT BUGS FAQ INSTALL NEWS TODO THANKS
-
-	# install misc files/scripts
-	newbin mirrorprobe/mirrorprobe.py mirrorprobe
-	insinto /usr/share/"${PN}"
-	doins -r sql
-	doins -r tools
-	rm "${D}"/usr/share/"${PN}"/tools/*.c
-	# install mirrordoctor
-	cd mirrordoctor
-	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
-	doins "${FILESDIR}"/mirrorbrain.conf.dist
-	fperms 0640 /etc/mirrorbrain.conf.dist
-	fowners root:mirrorbrain /etc/mirrorbrain.conf.dist
-}

diff --git a/www-misc/mirrorbrain/mirrorbrain-9999.ebuild b/www-misc/mirrorbrain/mirrorbrain-9999.ebuild
deleted file mode 100644
index 8260516..0000000
--- a/www-misc/mirrorbrain/mirrorbrain-9999.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit distutils eutils subversion
-
-#MY_PN="mirrorbrain"
-#MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Download Redirector and Metalink Generator"
-HOMEPAGE="http://mirrorbrain.org"
-SRC_URI=""
-ESVN_REPO_URI="https://forgesvn1.novell.com/svn/opensuse/trunk/tools/download-redirector-v2"
-LICENSE="Apache-2.0"
-
-KEYWORDS=""
-IUSE=""
-SLOT="0"
-
-DEPEND="dev-libs/geoip
-	=www-apache/mod_autoindex_mb-${PV}
-	=www-apache/mod_mirrorbrain-${PV}
-	www-apache/mod_form
-	dev-python/psycopg
-	dev-perl/DBD-Pg
-	dev-python/sqlobject
-	dev-perl/Config-IniFiles
-	dev-perl/Digest-MD4
-	dev-perl/libwww-perl
-	dev-python/cmdln"
-RDEPEND="${DEPEND}"
-
-#S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup mirrorbrain
-	enewuser mirrorbrain -1 -1 /dev/null mirrorbrain
-}
-
-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
-	distutils_src_compile
-}
-
-src_install() {
-	# install docs
-	dodoc ABOUT BUGS FAQ INSTALL NEWS TODO THANKS
-
-	# install misc files/scripts
-	newbin mirrorprobe/mirrorprobe.py mirrorprobe
-	insinto /usr/share/"${PN}"
-	doins -r sql
-	doins -r tools
-	rm "${D}"/usr/share/"${PN}"/tools/*.c
-	# install mirrordoctor
-	cd mirrordoctor
-	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
-	doins "${FILESDIR}"/mirrorbrain.conf.dist
-	fperms 0640 /etc/mirrorbrain.conf.dist
-	fowners root:mirrorbrain /etc/mirrorbrain.conf.dist
-}



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-10-14 16:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-12 22:40 [gentoo-commits] dev/darkside:master commit in: www-misc/mirrorbrain/ Jeremy Olexa
  -- strict thread matches above, loose matches on Subject: below --
2011-10-14 16:53 Jeremy Olexa
2011-10-12 22:33 Jeremy Olexa

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox