commit: beef495e5954417f0739aa4e9da33b63f43b28c4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 21:17:04 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 21:17:04 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=beef495e
Revert "[kde-base/kdelibs] Mark pax on /usr/bin/kdeinit4, bug #473842"
This reverts commit f6f2085d55ecd8e41e1b9b8dd5b4cfaab2fd4b97.
---
kde-base/kdelibs/kdelibs-4.12.49.9999.ebuild | 5 +----
.../kdelibs/{kdelibs-4.12.90-r1.ebuild => kdelibs-4.12.90.ebuild} | 5 +----
kde-base/kdelibs/kdelibs-4.13.49.9999.ebuild | 5 +----
kde-base/kdelibs/kdelibs-9999.ebuild | 5 +----
4 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/kde-base/kdelibs/kdelibs-4.12.49.9999.ebuild
b/kde-base/kdelibs/kdelibs-4.12.49.9999.ebuild
index faa3415..e28c016 100644
--- a/kde-base/kdelibs/kdelibs-4.12.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.12.49.9999.ebuild
@@ -8,7 +8,7 @@ CPPUNIT_REQUIRED="optional"
DECLARATIVE_REQUIRED="always"
OPENGL_REQUIRED="optional"
KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic pax-utils
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
EGIT_BRANCH="KDE/4.12"
@@ -232,9 +232,6 @@ src_compile() {
src_install() {
kde4-base_src_install
- # bug 473842
- pax-mark m "${ED}"/usr/bin/kdeinit4
-
# use system certificates
rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
dosym /etc/ssl/certs/ca-certificates.crt
/usr/share/apps/kssl/ca-bundle.crt
diff --git a/kde-base/kdelibs/kdelibs-4.12.90-r1.ebuild
b/kde-base/kdelibs/kdelibs-4.12.90.ebuild
similarity index 99%
rename from kde-base/kdelibs/kdelibs-4.12.90-r1.ebuild
rename to kde-base/kdelibs/kdelibs-4.12.90.ebuild
index 554be56..9863ab3 100644
--- a/kde-base/kdelibs/kdelibs-4.12.90-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.12.90.ebuild
@@ -8,7 +8,7 @@ CPPUNIT_REQUIRED="optional"
DECLARATIVE_REQUIRED="always"
OPENGL_REQUIRED="optional"
KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic pax-utils
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
EGIT_BRANCH="KDE/4.13"
@@ -232,9 +232,6 @@ src_compile() {
src_install() {
kde4-base_src_install
- # bug 473842
- pax-mark m "${ED}"/usr/bin/kdeinit4
-
# use system certificates
rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
dosym /etc/ssl/certs/ca-certificates.crt
/usr/share/apps/kssl/ca-bundle.crt
diff --git a/kde-base/kdelibs/kdelibs-4.13.49.9999.ebuild
b/kde-base/kdelibs/kdelibs-4.13.49.9999.ebuild
index 29b993e..a5e7ae0 100644
--- a/kde-base/kdelibs/kdelibs-4.13.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.13.49.9999.ebuild
@@ -8,7 +8,7 @@ CPPUNIT_REQUIRED="optional"
DECLARATIVE_REQUIRED="always"
OPENGL_REQUIRED="optional"
KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic pax-utils
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
EGIT_BRANCH="KDE/4.13"
@@ -232,9 +232,6 @@ src_compile() {
src_install() {
kde4-base_src_install
- # bug 473842
- pax-mark m "${ED}"/usr/bin/kdeinit4
-
# use system certificates
rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
dosym /etc/ssl/certs/ca-certificates.crt
/usr/share/apps/kssl/ca-bundle.crt
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild
b/kde-base/kdelibs/kdelibs-9999.ebuild
index 5d4588c..8f77154 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -8,7 +8,7 @@ CPPUNIT_REQUIRED="optional"
DECLARATIVE_REQUIRED="always"
OPENGL_REQUIRED="optional"
KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic pax-utils
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
EGIT_BRANCH="master"
@@ -232,9 +232,6 @@ src_compile() {
src_install() {
kde4-base_src_install
- # bug 473842
- pax-mark m "${ED}"/usr/bin/kdeinit4
-
# use system certificates
rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
dosym /etc/ssl/certs/ca-certificates.crt
/usr/share/apps/kssl/ca-bundle.crt
