[kde-base/printer-applet] Rename executable to printer-applet-kde (as gnome counterpart will follow)

5 files changed, 58 insertions, 22 deletions

diff --git a/kde-base/printer-applet/Manifest b/kde-base/printer-applet/Manifest
index 3a73a676016..dbfde49cef3 100644
--- a/kde-base/printer-applet/Manifest
+++ b/kde-base/printer-applet/Manifest
@@ -1,5 +1,5 @@
 DIST kdeutils-4.3.65.tar.lzma 2316768 RMD160 e0a21ee7577f49a277699f2f185cba158149cb07 SHA1 6c545802739c338608a9ba7a0d59ea0e7d152c20 SHA256 05f50655e5dc9d7d485df7f7a995fa2724244a78cb0a38a4a8ab170f1b522447
-EBUILD printer-applet-4.3.65.ebuild 401 RMD160 25b231807b029f791b63b25574e6e7468f4bb00a SHA1 8d07101c0313fd0f39dc1ed9a8cb270b22e9e2dc SHA256 7abd1681d3fba0e9cea0ada856b13ee4470f87695f65a399a44a15703599f04f
-EBUILD printer-applet-4.3.9999.ebuild 384 RMD160 5df8eb1a25da96fdb778fbe442bcae18e36b82e6 SHA1 6197afc8cba8aff4966b4ab89ae783553138348f SHA256 3ffa2425c826c96ee61415770e30665c16f2cdead0d083f7f881e6da7a3556c4
-EBUILD printer-applet-9999.ebuild 384 RMD160 5df8eb1a25da96fdb778fbe442bcae18e36b82e6 SHA1 6197afc8cba8aff4966b4ab89ae783553138348f SHA256 3ffa2425c826c96ee61415770e30665c16f2cdead0d083f7f881e6da7a3556c4
+EBUILD printer-applet-4.3.65-r1.ebuild 860 RMD160 4977f91014f670b92d65e80a86e5ae149029aa71 SHA1 4abecce6fb1322356b8635d842d04c2d6f384c1c SHA256 6c56ae65b8105396f7e64d20d2727715b19621909bc8fd35615952e3204777e6
+EBUILD printer-applet-4.3.9999.ebuild 843 RMD160 cf5fc9e8b3f1d900b0fd2399275a323d5d69b6e8 SHA1 9f9367435ca5c1695a5269f1802b4bbfa935e7d2 SHA256 709a3b0b476c5b74846ccc1c813fee30e4965c49980024290770c69d76e808c2
+EBUILD printer-applet-9999.ebuild 843 RMD160 cf5fc9e8b3f1d900b0fd2399275a323d5d69b6e8 SHA1 9f9367435ca5c1695a5269f1802b4bbfa935e7d2 SHA256 709a3b0b476c5b74846ccc1c813fee30e4965c49980024290770c69d76e808c2
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/printer-applet/printer-applet-4.3.65-r1.ebuild b/kde-base/printer-applet/printer-applet-4.3.65-r1.ebuild
new file mode 100644
index 00000000000..0aea8c328ef
--- /dev/null
+++ b/kde-base/printer-applet/printer-applet-4.3.65-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="kdeutils"
+inherit kde4-meta
+
+DESCRIPTION="KDE printer system tray utility"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+DEPEND="
+	>=app-admin/system-config-printer-common-1.1.8
+	app-misc/hal-cups-utils
+	>=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Rename printer-applet -> printer-applet-kde
+	local newname="printer-applet-kde"
+	sed -e "/PYKDE4_ADD_EXECUTABLE/s/ printer-applet[[:space:]]*)/ ${newname})/" \
+		-e "/install/s/)/ RENAME ${newname}.desktop)/" \
+		-i "${PN}"/CMakeLists.txt || die "failed to rename printer-applet executable"
+	sed -e "/Exec/s/printer-applet/${newname}/" \
+		-i "${PN}"/printer-applet.desktop || die "failed to patch .desktop file"
+}
diff --git a/kde-base/printer-applet/printer-applet-4.3.65.ebuild b/kde-base/printer-applet/printer-applet-4.3.65.ebuild
deleted file mode 100644
index 2265f22ed69..00000000000
--- a/kde-base/printer-applet/printer-applet-4.3.65.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KMNAME="kdeutils"
-inherit kde4-meta
-
-DESCRIPTION="KDE printer system tray utility"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-admin/system-config-printer-common-1.1.8
-	app-misc/hal-cups-utils
-	>=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/printer-applet/printer-applet-4.3.9999.ebuild b/kde-base/printer-applet/printer-applet-4.3.9999.ebuild
index 8280396297d..dc59e596ebc 100644
--- a/kde-base/printer-applet/printer-applet-4.3.9999.ebuild
+++ b/kde-base/printer-applet/printer-applet-4.3.9999.ebuild
@@ -17,3 +17,15 @@ DEPEND="
 	>=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=]
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Rename printer-applet -> printer-applet-kde
+	local newname="printer-applet-kde"
+	sed -e "/PYKDE4_ADD_EXECUTABLE/s/ printer-applet[[:space:]]*)/ ${newname})/" \
+		-e "/install/s/)/ RENAME ${newname}.desktop)/" \
+		-i "${PN}"/CMakeLists.txt || die "failed to rename printer-applet executable"
+	sed -e "/Exec/s/printer-applet/${newname}/" \
+		-i "${PN}"/printer-applet.desktop || die "failed to patch .desktop file"
+}
diff --git a/kde-base/printer-applet/printer-applet-9999.ebuild b/kde-base/printer-applet/printer-applet-9999.ebuild
index 8280396297d..dc59e596ebc 100644
--- a/kde-base/printer-applet/printer-applet-9999.ebuild
+++ b/kde-base/printer-applet/printer-applet-9999.ebuild
@@ -17,3 +17,15 @@ DEPEND="
 	>=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=]
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Rename printer-applet -> printer-applet-kde
+	local newname="printer-applet-kde"
+	sed -e "/PYKDE4_ADD_EXECUTABLE/s/ printer-applet[[:space:]]*)/ ${newname})/" \
+		-e "/install/s/)/ RENAME ${newname}.desktop)/" \
+		-i "${PN}"/CMakeLists.txt || die "failed to rename printer-applet executable"
+	sed -e "/Exec/s/printer-applet/${newname}/" \
+		-i "${PN}"/printer-applet.desktop || die "failed to patch .desktop file"
+}