Fix cherokee-admin, bug #482430

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

4 files changed, 20 insertions, 34 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 178b955b4361..f2bb4246eb2e 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.98 2013/07/17 07:34:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.99 2013/09/22 14:58:30 blueness Exp $
+
+*cherokee-1.2.103-r1 (22 Sep 2013)
+
+  22 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +cherokee-1.2.103-r1.ebuild, -cherokee-1.2.103.ebuild,
+  -files/cherokee-1.2.103-fix-Makefile-CTK.patch,
+  -files/cherokee-1.2.103-fix-configure.ac.patch:
+  Fix cherokee-admin, bug #482430
 
 *cherokee-1.2.103 (17 Jul 2013)
 
diff --git a/www-servers/cherokee/cherokee-1.2.103.ebuild b/www-servers/cherokee/cherokee-1.2.103-r1.ebuild
index c2c2722596e3..c0ce3ae31763 100644
--- a/www-servers/cherokee/cherokee-1.2.103.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.103-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.ebuild,v 1.1 2013/07/17 07:34:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.103-r1.ebuild,v 1.1 2013/09/22 14:58:30 blueness Exp $
 
 EAPI="5"
 PYTHON_DEPEND="admin? 2"
@@ -11,9 +11,9 @@ WANT_AUTOMAKE="1.11"
 inherit autotools eutils multilib pam python systemd
 
 DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip"
+SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip
+         https://github.com/cherokee/CTK/archive/master.zip       -> ${PN}-ctk-master.zip"
 HOMEPAGE="http://www.cherokee-project.com/"
-S="${WORKDIR}"/webserver-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -42,6 +42,13 @@ RESTRICT="test"
 
 WEBROOT="/var/www/localhost"
 
+src_unpack() {
+	unpack ${A}
+	mv "webserver-${PV}" "${S}" || die
+	rmdir "${S}/admin/CTK" || die
+	mv "CTK-master" "${S}/admin/CTK" || die
+}
+
 pkg_setup() {
 	python_pkg_setup
 
@@ -54,9 +61,7 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-1.2.99-gentoo.patch" \
-		"${FILESDIR}/${PN}-1.2.103-linux3.patch" \
-		"${FILESDIR}/${PN}-1.2.103-fix-configure.ac.patch" \
-		"${FILESDIR}/${PN}-1.2.103-fix-Makefile-CTK.patch"
+		"${FILESDIR}/${PN}-1.2.103-linux3.patch"
 
 	${S}/po/admin/generate_POTFILESin.py > po/admin/POTFILES.in
 	eautoreconf
diff --git a/www-servers/cherokee/files/cherokee-1.2.103-fix-Makefile-CTK.patch b/www-servers/cherokee/files/cherokee-1.2.103-fix-Makefile-CTK.patch
deleted file mode 100644
index 98b31823e4dc..000000000000
--- a/www-servers/cherokee/files/cherokee-1.2.103-fix-Makefile-CTK.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur webserver-1.2.103.orig/admin/Makefile.am webserver-1.2.103/admin/Makefile.am
---- webserver-1.2.103.orig/admin/Makefile.am	2013-01-26 17:52:44.000000000 -0500
-+++ webserver-1.2.103/admin/Makefile.am	2013-07-17 03:28:32.000000000 -0400
-@@ -1,6 +1,6 @@
- ## Cherokee: Makefile.am  -*- makefile -*-
- 
--SUBDIRS = plugins wizards CTK icons
-+SUBDIRS = plugins wizards icons
- 
- if INSTALL_ADMIN
- SUBDIRS += static
diff --git a/www-servers/cherokee/files/cherokee-1.2.103-fix-configure.ac.patch b/www-servers/cherokee/files/cherokee-1.2.103-fix-configure.ac.patch
deleted file mode 100644
index 3292c1bd7a37..000000000000
--- a/www-servers/cherokee/files/cherokee-1.2.103-fix-configure.ac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur webserver-1.2.103.orig/configure.ac webserver-1.2.103/configure.ac
---- webserver-1.2.103.orig/configure.ac	2013-01-26 17:52:44.000000000 -0500
-+++ webserver-1.2.103/configure.ac	2013-07-15 08:36:01.000000000 -0400
-@@ -1597,12 +1597,6 @@
- admin/static/images/flags/Makefile
- admin/static/images/wizards/Makefile
- admin/static/images/other/Makefile
--admin/CTK/Makefile
--admin/CTK/CTK/Makefile
--admin/CTK/static/css/Makefile
--admin/CTK/static/images/Makefile
--admin/CTK/static/js/Makefile
--admin/CTK/static/Makefile
- po/Makefile
- ])
-