Migrate to python-r1, fixing bug #472206. Make linguas handling more compliant with KDE conventions.

(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

3 files changed, 77 insertions, 3 deletions

diff --git a/kde-misc/kcm-ufw/ChangeLog b/kde-misc/kcm-ufw/ChangeLog
index b57ac4868aa4..02d25eadccce 100644
--- a/kde-misc/kcm-ufw/ChangeLog
+++ b/kde-misc/kcm-ufw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/kcm-ufw
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-ufw/ChangeLog,v 1.10 2012/09/23 18:25:46 thev00d00 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-ufw/ChangeLog,v 1.11 2013/07/11 09:10:22 kensington Exp $
+
+*kcm-ufw-0.4.3-r1 (11 Jul 2013)
+
+  11 Jul 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/kcm-ufw-0.4.3-linguas.patch, +kcm-ufw-0.4.3-r1.ebuild:
+  Migrate to python-r1, fixing bug #472206. Make linguas handling more compliant
+  with KDE conventions.
 
   23 Sep 2012; Ian Whyman <thev00d00@gentoo.org> -kcm-ufw-0.4.1-r3.ebuild:
   Drop old
@@ -50,4 +57,3 @@
   08 Jan 2012; Ian Whyman <thev00d00@gentoo.org> +kcm-ufw-0.4.1.ebuild,
   +metadata.xml:
   New ebuild for kcm-ufw
-
diff --git a/kde-misc/kcm-ufw/files/kcm-ufw-0.4.3-linguas.patch b/kde-misc/kcm-ufw/files/kcm-ufw-0.4.3-linguas.patch
new file mode 100644
index 000000000000..6fc3c90922f8
--- /dev/null
+++ b/kde-misc/kcm-ufw/files/kcm-ufw-0.4.3-linguas.patch
@@ -0,0 +1,26 @@
+Comply with standard KDE conventions so that linguas may be handled by the eclass,
+instead of implementing package-specific hacks.
+
+--- po/CMakeLists.txt
++++ po/CMakeLists.txt
+@@ -8,19 +8,7 @@
+     set(catalogname kcm_ufw)
+     add_custom_target(translations ALL)
+     
+-    if (UFW_ES_TRANSLATION)
+-        LIST(APPEND PO_FILES "${CMAKE_CURRENT_SOURCE_DIR}/es.po")
+-    endif (UFW_ES_TRANSLATION)
+-
+-    if (UFW_FR_TRANSLATION)
+-        LIST(APPEND PO_FILES "${CMAKE_CURRENT_SOURCE_DIR}/fr.po")
+-    endif (UFW_FR_TRANSLATION)
+-
+-    if (UFW_LT_TRANSLATION)
+-        LIST(APPEND PO_FILES "${CMAKE_CURRENT_SOURCE_DIR}/lt.po")
+-    endif (UFW_LT_TRANSLATION)
+-
+-    # file(GLOB PO_FILES *.po)
++    file(GLOB PO_FILES *.po)
+     foreach(_poFile ${PO_FILES})
+         get_filename_component(_poFileName ${_poFile} NAME)
+         string(REGEX REPLACE "^${catalogname}_?" "" _langCode ${_poFileName} )
diff --git a/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild b/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..4fb5eb5042e2
--- /dev/null
+++ b/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild,v 1.1 2013/07/11 09:10:22 kensington Exp $
+
+EAPI=5
+
+KDE_DOC_DIRS="docs/%lingua"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="es fr lt"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit python-r1 kde4-base
+
+MY_P="${P/-/_}"
+
+DESCRIPTION="KCM module to control the Uncomplicated Firewall"
+HOMEPAGE="http://kde-apps.org/content/show.php?content=137789"
+SRC_URI="http://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=net-firewall/ufw-0.31
+	sys-auth/polkit-kde-agent
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kcmshell)
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${P}-linguas.patch" )
+
+src_install() {
+	kde4-base_src_install
+	python_replicate_script "${D}"/usr/lib64/kde4/libexec/kcm_ufw_helper.py
+}