[kde-base] General cleanup, remove some conditionals from :live (as we want the :live version for 4.7 now as well)

(Portage version: 2.2.0_alpha35/git/Linux x86_64, signed Manifest commit with key 229E5838)

3 files changed, 25 insertions, 32 deletions

diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 4a82f3928ed..b29e3991fc8 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -5,24 +5,24 @@ AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a435
 AUX pykde4-4.5.5-typedefs-fix.patch 3309 RMD160 c81c29abdd9adaa73ffbf899fd722b861ba95a10 SHA1 f0e0318e996ccd82eaa9304c184b8d4cda4d7a50 SHA256 5a94419ae8edc80b7231ed3d3afb23d497fc47adf798b6e18bca9060788f87d7
 AUX pykde4-4.5.90-typedefs-fix.patch 2110 RMD160 93a7e6b0a23fda700342ac4178a33fbe457c8244 SHA1 59b3992de8def0e415a055246d2d3d0a2934d8d9 SHA256 4b441ad05c553383a94e4856462c0c747b81acc5fe44782cdcb4371715b7ddf3
 DIST pykde4-4.6.80.tar.bz2 2106824 RMD160 f12aa3b512e4e1566dcc10cbbcca560cc74c49d0 SHA1 f45e40298046ecea382f9b85c34b3e21d856a9da SHA256 51bf720c4f298dca56244b99252611377603234d43508650c8f9494a21494102
-EBUILD pykde4-4.6.80.ebuild 1960 RMD160 2634074694e3174d2b36bb3deee300dc04b6dbb4 SHA1 eb1e3019ef1a350a23b01cfa4b8615c17c2cb598 SHA256 ab040dacebe80a47a253e2261214e110b05499a83ec20ce33b9157a7822c5088
+EBUILD pykde4-4.6.80.ebuild 1948 RMD160 a4f5fc834b8290deaaf0c49dafbfba7b88b1f92f SHA1 29d9a9faf2f4f74168bb5a5faa9ed5ebe81b673a SHA256 3d6f4d92a26e57a5346cabe84dcc1255f186efde4e164f3bf04a6a58c3fc255a
 EBUILD pykde4-4.6.9999.ebuild 2054 RMD160 55300b23bd5508685ea04924fb7c75dbcc99b77a SHA1 d2c25ee9e8e57969f78f88c3948455bf6e3ffc90 SHA256 db3b7c388825306550f8dd3b7f48a32d433b18785dbd1946dfeef05f60b59b4c
-EBUILD pykde4-9999.ebuild 2054 RMD160 55300b23bd5508685ea04924fb7c75dbcc99b77a SHA1 d2c25ee9e8e57969f78f88c3948455bf6e3ffc90 SHA256 db3b7c388825306550f8dd3b7f48a32d433b18785dbd1946dfeef05f60b59b4c
+EBUILD pykde4-9999.ebuild 1913 RMD160 6b394efc352d949f8a4a48b2603b65124c9e6a2a SHA1 dafe0d24a4bc188d93523ba8a75a018ef0c5e362 SHA256 bf6f94a41f2bb64fa9197b4a90fc4a8c6d80b2e7f635c23b725a23d01f3780d9
 MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN5D4tAAoJELHSF2kinlg4g78P/j0PXsFmx3KObDZuPXrD3MfV
-B7S98njRFPR7QY/uKz2XYMUqZ2N0/7ueLaqhIRNJ7ytc/dMTFy11i/hXhr8cve8H
-fNKJKpf6TCtw+RWnKrV9Ufiq7h2mEnI9Ic1Auq8ecP1b1w4XZiSF6UxK98TT1gE9
-vVQqnzhdelV3Irn38ak3KBqOpKNsKrET5MJ1YepMiC8lD2wvjhBkXfxFhwFZo8EZ
-qmMwdKiN+YiACXQVtArow+Dglc7aWfxCezcOLS9SF+BK9umX8+6E150sDK1aFF9x
-7ZjP+ZN3hMU6FIakD/WJjZ+03mC9ToRKbjdx7pYTmfy5w/jNOqwghhd5foZmKfgT
-JcNGbUQ9Oo0sJ/AzxUDcnVMolu8f+NoDwarZUhZ0uJYA+ZcEKkPbOrFjS/3rGn10
-DqUfiRbbQtvJLfYZCySO1Xlye5NJHpzRl3QuC5j8dp3HlknHcCAJ6BSErpzb8nWT
-m+kMLCu9gwRhBdwzHT5T1nXXrlPSl/w/maNP2fHw0w5S0DE8kzo2gzi/yTm8Dlpe
-uRgrexSzPuH9gJ7DLC8p29ZWHxgmVjNtejd3FAfxDDfBqmo5992zPaJs5Y6BRqvd
-tFMDEc3lBCqbP0c+YJd0uk7/oNMGZplxWXBlKP/dYt5t0LLHsZ7rC2MwEJJ3naN2
-TtzgYHddgZMvhYLnuttm
-=4ZSt
+iQIcBAEBCAAGBQJN5E3SAAoJELHSF2kinlg4TasP/3mxCbjKQyG08G/w2kBymmB5
+wPIFUeiW4+swGcsP6uCVyL32lfdnbM+IFcutvZrjDWiS5BYgdtc9X44hhXNG6MHo
+DrDE9rFqtFNbz1Nmq7SLQEb2kTTKRF1YRac+M7zMV10umPmMpVjEPRyanNCWycJG
+jf6vVf4kGiUn8o45fKRPHtDUgyqhV/UkyJJzYnPQ41nIpwJvaYC2L41jYRvjRTLj
+HndqPVaZzL9p3B9Y1ZOtyQL1hzhYAF2wg1xR4uTfPx2HNRAcyWjiRLY8FTPLFDQ0
++gN5JX1E/Srg4L5eRRiCFGOCuIwjy+z61d7dWpz0MBTngdrMk8YXpRnIUG4JESme
+bj2BTEmtrzFhX8vqc4pXvwf1Qw/vzXTmWOo/TIHUnFQjZln5r5lFNgiNCEdQEnfW
++UnN1vs2ry0Xwvc2vznt+3OXDu+eTL5ZFkY/8uxwvnnBlkcuPVGpmbXihmI5OfR/
+FT1uEspEBQwf85ewpEba8P0ysGz/BqwO8z1JCo1mEVr9SYy4UwAy6AThe+Zb2/Pc
+sqFZg67gCB5RHfPjQE3A8BVgxLQDWVWZm7HET72HxV/bXB6PCsd4MG+g4PltpkpV
+MY8h+utmPRVDkaYzW0V8rw4NZCuj9iUGH/nsKB8atfO1l0vkjrNkXNwu3gTqJ+aA
+NjQpl9I8gHLJE89aEuGf
+=OVBG
 -----END PGP SIGNATURE-----
diff --git a/kde-base/pykde4/pykde4-4.6.80.ebuild b/kde-base/pykde4/pykde4-4.6.80.ebuild
index 06c4fabc7f4..abd47c9c4cd 100644
--- a/kde-base/pykde4/pykde4-4.6.80.ebuild
+++ b/kde-base/pykde4/pykde4-4.6.80.ebuild
@@ -59,7 +59,7 @@ src_configure() {
 }
 
 src_install() {
-	use doc && HTML_DOCS=("${S}/${KMMODULE}/docs/html/")
+	use doc && HTML_DOCS=("${S}/docs/html/")
 
 	kde4-base_src_install
 
diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index 671b1b0512d..cda5b5cf659 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -4,19 +4,12 @@
 
 EAPI=3
 
-KMNAME="kdebindings"
-if [[ ${PV} != *9999 ]]; then
-	KMMODULE="python/pykde4"
-else
-	# HACK HACK HACK
-	KMMODULE="."
-fi
 OPENGL_REQUIRED="always"
 PYTHON_USE_WITH="threads"
 RESTRICT_PYTHON_ABIS="2.4"
 KDE_SCM="git"
 EGIT_REPONAME="pykde4"
-inherit python kde4-meta
+inherit python kde4-base
 
 DESCRIPTION="Python bindings for KDE4"
 KEYWORDS=""
@@ -35,14 +28,14 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	python_pkg_setup
-	kde4-meta_pkg_setup
+	kde4-base_pkg_setup
 }
 
 src_prepare() {
-	kde4-meta_src_prepare
+	kde4-base_src_prepare
 
 	if ! use examples; then
-		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i ${KMMODULE}/CMakeLists.txt \
+		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i CMakeLists.txt \
 			|| die "Failed to disable examples"
 	fi
 
@@ -62,20 +55,20 @@ src_configure() {
 		$(cmake-utils_use_with semantic-desktop KdepimLibs)
 	)
 
-	kde4-meta_src_configure
+	kde4-base_src_configure
 }
 
 src_install() {
-	use doc && HTML_DOCS=("${S}/${KMMODULE}/docs/html/")
+	use doc && HTML_DOCS=("${S}/docs/html/")
 
-	kde4-meta_src_install
+	kde4-base_src_install
 
 	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 	python_clean_installation_image -q
 }
 
 pkg_postinst() {
-	kde4-meta_pkg_postinst
+	kde4-base_pkg_postinst
 
 	python_mod_optimize PyKDE4 PyQt4
 
@@ -88,7 +81,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	kde4-meta_pkg_postrm
+	kde4-base_pkg_postrm
 
 	python_mod_cleanup PyKDE4 PyQt4
 }