system-config-printer-kde - fixed live ebuild sandbox issue - ebuils

synced

5 files changed, 41 insertions, 10 deletions

diff --git a/kde-base/system-config-printer-kde/ChangeLog b/kde-base/system-config-printer-kde/ChangeLog
index 152eb06d27c..75dfdd5d876 100644
--- a/kde-base/system-config-printer-kde/ChangeLog
+++ b/kde-base/system-config-printer-kde/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  system-config-printer-kde-4.2.1.ebuild,
+  system-config-printer-kde-4.2.65.ebuild,
+  system-config-printer-kde-9999.ebuild:
+  Updated system-config-printer-kde - fixed live: sandbox issue - synced
+  ebuilds
+
   08 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   system-config-printer-kde-4.2.1.ebuild,
   system-config-printer-kde-4.2.65.ebuild,
diff --git a/kde-base/system-config-printer-kde/Manifest b/kde-base/system-config-printer-kde/Manifest
index 0c38eaa211d..08ae4418471 100644
--- a/kde-base/system-config-printer-kde/Manifest
+++ b/kde-base/system-config-printer-kde/Manifest
@@ -1,8 +1,8 @@
 DIST kdeadmin-4.2.1.tar.bz2 1923382 RMD160 94a77adc11053c19829bba12dc8cf498b883791c SHA1 888203103fe86010461b1e38d51ba9a20f3250e8 SHA256 48c063373211befe47d103f0ecf43f6e23a0b41a5a52d880b3c6374c1c13b498
 DIST kdeadmin-4.2.65.tar.lzma 1695342 RMD160 a298e12ab77c5a2b469c04ec49d26f1d87d8e4c2 SHA1 aa2f75dc19d99dcdc035aac7cf84ea82076bede3 SHA256 0bf21f0d0f7077c3f7e322ca8e2e070aec896f260979ebc7eeaaec7d46682aef
 DIST system-config-printer-1.1.3.tar.bz2 874825 RMD160 213809d747edd7b36f126a1d0d2859a34d4081e4 SHA1 758ac47d1a72eeca3e347e34ca63199c80da9696 SHA256 a3589ff575be2cf776a06b0004ff4d45ac1e3e88eb10719fae6e084ddc1e5854
-EBUILD system-config-printer-kde-4.2.1.ebuild 1546 RMD160 57ea0c3f4fb43bc1f70c1591887dd4937755bd42 SHA1 a2e620b54f6d56b189c144086d1bd66e01f5e752 SHA256 1f41d680f94a2436a90b209e568f09d17dd02f252e9e6a84a5c79c38ea05c0ff
-EBUILD system-config-printer-kde-4.2.65.ebuild 1546 RMD160 57ea0c3f4fb43bc1f70c1591887dd4937755bd42 SHA1 a2e620b54f6d56b189c144086d1bd66e01f5e752 SHA256 1f41d680f94a2436a90b209e568f09d17dd02f252e9e6a84a5c79c38ea05c0ff
-EBUILD system-config-printer-kde-9999.ebuild 1523 RMD160 1ddf29210a0ec20417f4aee3ca78a684f789475e SHA1 ac6ef5da112785eea06ec7d26cc0e15ecad71673 SHA256 b2aea698bd562635bfa614f818f57200f82016bcf8edfd989da5919d00ae2d9f
-MISC ChangeLog 1947 RMD160 485b8d4e2a5509bdf3a6c3d6f610b2bddeec3dd0 SHA1 80254d765865a949f9d86f84f7b929244c62a288 SHA256 b036232de5b49cb8257a654ca62fdfcc3fe9b9f7fce86b1981c4a8d576f4ef55
+EBUILD system-config-printer-kde-4.2.1.ebuild 1903 RMD160 8ff84f047f40d82dd267f3bf89d5dc8318f44bd0 SHA1 b0bbe79bf38356b5181588a9eb6a3da8b71b7194 SHA256 6322e3296ac22d4be3a33f91ecf530fa6165fe523bb4b72af827554b6181e1c7
+EBUILD system-config-printer-kde-4.2.65.ebuild 1903 RMD160 8ff84f047f40d82dd267f3bf89d5dc8318f44bd0 SHA1 b0bbe79bf38356b5181588a9eb6a3da8b71b7194 SHA256 6322e3296ac22d4be3a33f91ecf530fa6165fe523bb4b72af827554b6181e1c7
+EBUILD system-config-printer-kde-9999.ebuild 1880 RMD160 494a4600b1baeef2fec779f318466bfe3832ee48 SHA1 cff0c6ba523dd95b06251d6809e7d50e032877ed SHA256 04f9440307b19cffa2e20d5de446570df78ba5ed0513cbde0fccb7d1a1bb69f6
+MISC ChangeLog 2221 RMD160 7072e16237ad25f27e9d4f2ca0c39866ba870718 SHA1 260057c565e2f0add7cd060182dc891129bc5550 SHA256 4e63d2ef8c85fd14f92fdc488fd8e9562fa6a033ab374a689f80c45e6d5221b2
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.1.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.1.ebuild
index 7ad98077dfe..d9d3f428c97 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.1.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.1.ebuild
@@ -37,13 +37,17 @@ src_unpack() {
 src_prepare() {
 	kde4-meta_src_prepare
 
+	# Workaround sandbox violation
+	sed -i -e '/PYKDE4_ADD_EXECUTABLE(system-config-printer-kde.py.*)/s/^/#DONOTINSTALL /' \
+		${PN}/CMakeLists.txt || die "failed to disable automatic installation"
+
 	# Update config.py
 	sed -i \
 		-e "s|^prefix=.*$|prefix=\"${KDEDIR}\"|" \
 		-e "s|^datadir=.*$|datadir=\"${KDEDIR}/share\"|" \
 		-e "s|^localedir=.*$|localedir=\"${KDEDIR}/share/locale\"|" \
 		-e "s|^pkgdatadir=.*$|pkgdatadir=\"${KDEDIR}/share/apps/${PN}\"|" \
-			"${S}"/${PN}/config.py || die "failed to update config.py"
+			${PN}/config.py || die "failed to update config.py"
 
 	# Make it find our stripped system-config-printer
 	export PYTHONPATH="${S}/${PN}:${PYTHONPATH}"
@@ -55,6 +59,10 @@ src_install() {
 	# Do not compile python modules
 	python_disable_pyc
 
+	# Manually install some files
+	dosym "${KDEDIR}"/share/apps/${PN}/system-config-printer-kde.py \
+		"${KDEDIR}"/bin/system-config-printer-kde || die "dosym failed"
 	insinto "${KDEDIR}"/share/apps/${PN}
-	doins -r `eval echo "${S}"/${PN}/${SYS_CONF_PR_MODULES}` || die "doins failed"
+	doins -r `eval echo "${S}"/${PN}/${SYS_CONF_PR_MODULES}` \
+		|| die "doins failed"
 }
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.65.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.65.ebuild
index 7ad98077dfe..d9d3f428c97 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.65.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.65.ebuild
@@ -37,13 +37,17 @@ src_unpack() {
 src_prepare() {
 	kde4-meta_src_prepare
 
+	# Workaround sandbox violation
+	sed -i -e '/PYKDE4_ADD_EXECUTABLE(system-config-printer-kde.py.*)/s/^/#DONOTINSTALL /' \
+		${PN}/CMakeLists.txt || die "failed to disable automatic installation"
+
 	# Update config.py
 	sed -i \
 		-e "s|^prefix=.*$|prefix=\"${KDEDIR}\"|" \
 		-e "s|^datadir=.*$|datadir=\"${KDEDIR}/share\"|" \
 		-e "s|^localedir=.*$|localedir=\"${KDEDIR}/share/locale\"|" \
 		-e "s|^pkgdatadir=.*$|pkgdatadir=\"${KDEDIR}/share/apps/${PN}\"|" \
-			"${S}"/${PN}/config.py || die "failed to update config.py"
+			${PN}/config.py || die "failed to update config.py"
 
 	# Make it find our stripped system-config-printer
 	export PYTHONPATH="${S}/${PN}:${PYTHONPATH}"
@@ -55,6 +59,10 @@ src_install() {
 	# Do not compile python modules
 	python_disable_pyc
 
+	# Manually install some files
+	dosym "${KDEDIR}"/share/apps/${PN}/system-config-printer-kde.py \
+		"${KDEDIR}"/bin/system-config-printer-kde || die "dosym failed"
 	insinto "${KDEDIR}"/share/apps/${PN}
-	doins -r `eval echo "${S}"/${PN}/${SYS_CONF_PR_MODULES}` || die "doins failed"
+	doins -r `eval echo "${S}"/${PN}/${SYS_CONF_PR_MODULES}` \
+		|| die "doins failed"
 }
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
index 7c73875b0ac..da461d66d35 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
@@ -37,13 +37,17 @@ src_unpack() {
 src_prepare() {
 	kde4-meta_src_prepare
 
+	# Workaround sandbox violation
+	sed -i -e '/PYKDE4_ADD_EXECUTABLE(system-config-printer-kde.py.*)/s/^/#DONOTINSTALL /' \
+		${PN}/CMakeLists.txt || die "failed to disable automatic installation"
+
 	# Update config.py
 	sed -i \
 		-e "s|^prefix=.*$|prefix=\"${KDEDIR}\"|" \
 		-e "s|^datadir=.*$|datadir=\"${KDEDIR}/share\"|" \
 		-e "s|^localedir=.*$|localedir=\"${KDEDIR}/share/locale\"|" \
 		-e "s|^pkgdatadir=.*$|pkgdatadir=\"${KDEDIR}/share/apps/${PN}\"|" \
-			"${S}"/${PN}/config.py || die "failed to update config.py"
+			${PN}/config.py || die "failed to update config.py"
 
 	# Make it find our stripped system-config-printer
 	export PYTHONPATH="${S}/${PN}:${PYTHONPATH}"
@@ -55,6 +59,10 @@ src_install() {
 	# Do not compile python modules
 	python_disable_pyc
 
+	# Manually install some files
+	dosym "${KDEDIR}"/share/apps/${PN}/system-config-printer-kde.py \
+		"${KDEDIR}"/bin/system-config-printer-kde || die "dosym failed"
 	insinto "${KDEDIR}"/share/apps/${PN}
-	doins -r `eval echo "${S}"/${PN}/${SYS_CONF_PR_MODULES}` || die "doins failed"
+	doins -r `eval echo "${S}"/${PN}/${SYS_CONF_PR_MODULES}` \
+		|| die "doins failed"
 }