Switch to python-r1 and fix bug #506780

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 28 insertions, 36 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index e5c66c4d0c97..db587ac405da 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.101 2014/01/08 06:08:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.102 2014/05/31 14:53:01 blueness Exp $
+
+*cherokee-1.2.103-r2 (31 May 2014)
+
+  31 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +cherokee-1.2.103-r2.ebuild, -cherokee-1.2.103-r1.ebuild:
+  Switch to python-r1 and fix bug #506780
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> cherokee-1.2.101-r1.ebuild,
   cherokee-1.2.101-r2.ebuild, cherokee-1.2.101-r3.ebuild,
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index e8273d3f254e..c1deccfa5fce 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -15,23 +15,23 @@ DIST cherokee-ctk-master.zip 415092 SHA256 dede313f1d396f1deaf78d9fd9a1270820d2e
 EBUILD cherokee-1.2.101-r1.ebuild 4993 SHA256 faba92f62a21ec63513ce2bf32d3494644dd9dcd7614736430a163754bca2bf2 SHA512 c88eaad9be1dec7b7b52037a509368f3841b93ed90d3a5adbfa6a7e09dd923cf19134e26fa9dcca39d8a1e20096bb6d8ca99172dd45df9d1e505d0018315f9e6 WHIRLPOOL 070f70058a0f1440ccf120b3bd12c26401fa3052d0706f1a57f972a71091910410aa8e724baa0ec4aba1613fdbf5fc89bd37877135b9b6df3826f4802b467229
 EBUILD cherokee-1.2.101-r2.ebuild 5145 SHA256 baf12b4bebc38a8529daa1cbb05ef312c079b94bad3b6efa8637082b2f6a7a4b SHA512 e8def22dbf04c748aeec730d9cbd115c5e3ad380d84951b5757d69483693569fcb6e55c428d1976b54a2de774ad2599f02ba12a8a39afc746f8eae447ca07a08 WHIRLPOOL 73db60bd1b1be66ad3845d5e04c2123edf5e3d73351614f02238123c31c0154f56e360fe783957ec6ef70163de2f3657e132f7143a47f527b87f549fa5e8f701
 EBUILD cherokee-1.2.101-r3.ebuild 5201 SHA256 7b7ff55340bf7d10c6384b3ec642678e9e4a56f7bce9e8a677194f3d65635caa SHA512 b945beb758c75c39bbf106bc785034f182a83bbe26d26c907755149e5e84cd1ebee31f11da021e642859c4e10d2fa0af936880b6742d20f1bbb70b2164a895f6 WHIRLPOOL 789ab6a3df381ef9b92e427001e4d8a95178592e3fbbd0f059ca258f4907decf38dc00a9d70f5852d124afd53a3205492822e8a4cc2329af863e05d75d819921
-EBUILD cherokee-1.2.103-r1.ebuild 5459 SHA256 40e5ae5612e80d6fa21464a105a16b4588f2302aaaed242eec5d17752bf88983 SHA512 87d12439af977a7c4a61cb8faf07eead44841e02a3b76f4fffb3a9a2c34e71e718f496cbfb8cd9b95e50da17e2b9a2c25a61fc00a0aa27851dc9f2995467c953 WHIRLPOOL 1df0c098cca711cc36c444bf6d39c66180d364f51a234627c78b0af7f58d0ad6d8b053c2cf9a661dcbea72b740b0ca17956eeb72ab65aa137d6808d918199690
-MISC ChangeLog 23177 SHA256 5a344da7eceecd9f456d55f9a22e0566dcf853e4b6c3ec70e68b03486a5ecc6a SHA512 987f28945861afd46447bd64c4f76c49c0799bb1c39b1aa8e96863b7afefb7099419cd8674b8ac69c3e1b20bc3faa614ad7bd10405df13969fcce435712d8fa1 WHIRLPOOL 9fd8886a2c3723428aa23e7ba8a1af13b32214ca5152fbc1e6264838cfd9cdedfe40f3461784213ecc57d11b9027b59e90439c05d14ed0367022c920016cadbc
+EBUILD cherokee-1.2.103-r2.ebuild 5154 SHA256 563cb48fdd23aa933586d1c41071ff7d6eedf41f993a0db34acc43b6a1ef324b SHA512 d1ae08ec0aa4919f641471270d8d2e4f1611b641c09e1cc27c162f5332aca93a021ad999e15fae5457ef24fba8a7e927793e4fad734859f39d187ce99a058fe0 WHIRLPOOL a2f04d70cae7736096ef4920e21f284611c9a977d081795609c11ba67c82e6cac140b042dcab31bb380e009dd0d62a0c00baae91ef1fddadc0c323f73d939480
+MISC ChangeLog 23373 SHA256 f84ba947151ccd0a1afb52bc9f97b9d60d72fb6fe2116009787e0c3390825cd0 SHA512 75a0a0c761358131146bbf05b452194122945e7b48b73971a582995391ee37bd9baf4689af42465b11cba82907cd24b028a5980f996ccb2661d5e33fd88af3e1 WHIRLPOOL 6eaa9b08bcb11dac6459f740b2249452c54ea6b1596da7e92199b388afd7918a5d35e016a75d79e917c462487dd2eae6c7807745f91caba9613117b4bddc8f37
 MISC metadata.xml 440 SHA256 21e70301f21aa69d90ebede277859fcbdd5194528b4ff186610d0143408a0949 SHA512 74b1ea827c31205fe666c6be1475959857148eec167754f11dcccb5098daf3d64ad950793983d7920ea26fd8ac864c7da606c37ecff9841b714ba7b9ad24516d WHIRLPOOL 370deef54eaeaceec348852489cea16e24d9aa472bbbaf93ac18e6c08d160492e108145bfa8ef59636c85e0c2d3a1bd191a0e371ac2e66615fc3d9c34544d547
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzOtuAAoJEPGu1DbS6WIAwmgP/0Q4g01cQ5sdIpKFRtP8/UKq
-2Od1SU846+egS9szRCng7sK01C0l55usgjQuybJApsBIz9zQtAiCwI45bJ8cjRwq
-mUsCoeCheAtZZlsSZh82dUjS7nxxgSoSgmRrIYFIm3jFwlUJvGFw8yEUXKVXUlpi
-1fwRytLYBjGf1J7vkbV79qzgHPwk0gV1oWBp2C4NQglJMHN7rRxqxGvrafwE+xFt
-tJBjMb5EGCtIMLCvY1ia+ELbILF1su7xUBBOH//3FExNiQ1+LqAA+tf3d+im+sFD
-9uRhD3kfOA875Ex2kcJyunJWL6Z/pBiR6GQpI+ihcqxqBiWu4OpGB2QFaga2MZ7C
-eSox/moAnn7oTapJZYV1p6nUk8fft/2AMUmyKJjEYsopye+FdKSxanqJiocRO0SW
-kf8uKy4BnhWQ0Iryrsbw4vTKVRACHDaYsYgFxTCeya31Tp3ZXMq7hRtR/mNsA7c1
-Ibj6HMxlbhkOUByg/m4fI2EHUfbb9indRZY1C7YE6Vi0FRyT1EMOVvJupA0IgS5/
-Zn9RiZtKg5LErK5C7sBTGGMLfvzdA7AuhCl9Z2rgHgj6optDoLSLMVa0IQ8xn6Fb
-v5L4dYWLRkf/TtLCR+Yvmtlj75bVQ+U+kksfLc9Xya0WMINQAaJj51oMRhUekrmX
-Vy+vbK/znoIfC4kNE8dE
-=UzzF
+iQIcBAEBCAAGBQJTie1tAAoJEJOE+m71LUu6jd8P/ieBgNa5oZLKr85buJq243AV
+Bomo6zqH6V7pDEN1r3Y3thvi/Y5CeYt1ZzHmSLfgiOxVAWy8NKIXl2IuCu3BYhEH
+/A6sIXQ64G4L3ybN2oC9L6mMwrnLaolB1f6HGP32fDo+F+poDdfzu7U7cPFfcYTk
+9LGWnTPGH8xfmydM8iay8QwK/cPHEhyXHnEWbx47CTHVbOcn/iqeivZthOF5cQMX
+DkL6S9m1aBO1/UEa9BL9NF/K/Pdv+uzc3dc1OPZuqWkyzHk6eHfnonlrgc+/slEd
+azU6w16mGgHLZbNSH6Ok8p5H7QsWXHAoyZ84IiFBsUO93TRHxQVe2BM0YJq4UmDt
+us9iQP84qFV4hHoUxAZFhilgjt3A/pipa7rImZiKHiMGzYRFjJZSgImH0OOwGUiG
+f6/SoJda9YWhRjGqtkCCZPvbNZ0Q65LjLgZeAWFqJ4AJpp/7OSOtQ41D6Bhfk5v6
+QUrZTXHqJErHbtGA2VA7Vps9SsDD0+7LhO3slRtGV6L/gb4g42QKKgcvkL+rddbb
+UdIeGldWZeuvaDeRkTn9BmKKP2Lgo31Yz1WY6iS6/PLvxgCM5LdF2roqGa2P+IZQ
+FFzRF+PglQKna04s/lY2SunO3gOBS0ixuL2ZP8s1YvcTTIXBDrWXVRBc67JXjSDL
+NC8jeVsOkht40aJ+kiKH
+=pUNM
 -----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-1.2.103-r1.ebuild b/www-servers/cherokee/cherokee-1.2.103-r2.ebuild
index 8c86a27b85fe..dbcedcf62ab7 100644
--- a/www-servers/cherokee/cherokee-1.2.103-r1.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.103-r2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.103-r1.ebuild,v 1.3 2014/01/08 06:08:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.103-r2.ebuild,v 1.1 2014/05/31 14:53:01 blueness Exp $
 
 EAPI="5"
-PYTHON_DEPEND="admin? 2"
-PYTHON_USE_WITH="threads"
 
 WANT_AUTOMAKE="1.11"
 
-inherit autotools eutils multilib pam python systemd user
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools python-r1 eutils multilib pam systemd user
 
 DESCRIPTION="An extremely fast and tiny web server."
 SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip
@@ -50,30 +50,25 @@ src_unpack() {
 }
 
 pkg_setup() {
-	python_pkg_setup
-
-	python_set_active_version 2
-
 	enewgroup cherokee
 	enewuser cherokee -1 -1 /var/www cherokee
 }
 
 src_prepare() {
+	python_setup
 	epatch \
 		"${FILESDIR}/${PN}-1.2.99-gentoo.patch" \
 		"${FILESDIR}/${PN}-1.2.103-linux3.patch"
 
 	"${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in
 	eautoreconf
-
-	python_convert_shebangs -r 2 .
 }
 
 src_configure() {
 	local myconf
 
 	if use admin ; then
-		myconf="${myconf} --enable-admin --with-python=$(PYTHON -2)"
+		myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
 	else
 		myconf="${myconf} --disable-admin --without-python"
 	fi
@@ -99,8 +94,6 @@ src_configure() {
 			os="Linux" ;;
 	esac
 
-	# This make cherokee 1.2 sad
-	#	$(use_enable threads pthread) \
 	econf \
 		$(use_enable debug trace) \
 		$(use_enable debug backtraces) \
@@ -180,7 +173,6 @@ src_install() {
 pkg_postinst() {
 	elog
 	if use admin ; then
-		python_mod_optimize "${EPREFIX}/usr/share/cherokee/admin/"
 		elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090"
 		elog
 		elog "Cherokee currently supports configuration versioning, so from now on,"
@@ -200,9 +192,3 @@ pkg_postinst() {
 	elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}."
 	elog
 }
-
-pkg_postrm() {
-	if use admin ; then
-		python_mod_cleanup "${EPREFIX}/usr/share/cherokee/admin/"
-	fi
-}