From bd33fae5edcd1c6117f7603eca4f4da688ef00fa Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Tue, 24 Apr 2007 19:49:52 +0000 Subject: [PATCH] Fix bogus install locations thanks to Yaroslav Isakov in bug 175611, remove old broken ebuilds Package-Manager: portage-2.1.2.4 --- x11-themes/gtk-engines-qt/ChangeLog | 14 +++++- x11-themes/gtk-engines-qt/Manifest | 48 +++++-------------- .../files/digest-gtk-engines-qt-0.7-r1 | 3 -- ...=> digest-gtk-engines-qt-0.7_p20070327-r1} | 0 .../files/gtk-engines-qt-0.7-implicit.patch | 11 ----- .../files/kcmgtk-write-good-bashrc.diff | 20 -------- .../gtk-engines-qt-0.7-r1.ebuild | 43 ----------------- ...=> gtk-engines-qt-0.7_p20070327-r1.ebuild} | 7 ++- 8 files changed, 29 insertions(+), 117 deletions(-) delete mode 100644 x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.7-r1 rename x11-themes/gtk-engines-qt/files/{digest-gtk-engines-qt-0.7_p20070327 => digest-gtk-engines-qt-0.7_p20070327-r1} (100%) delete mode 100644 x11-themes/gtk-engines-qt/files/gtk-engines-qt-0.7-implicit.patch delete mode 100644 x11-themes/gtk-engines-qt/files/kcmgtk-write-good-bashrc.diff delete mode 100644 x11-themes/gtk-engines-qt/gtk-engines-qt-0.7-r1.ebuild rename x11-themes/gtk-engines-qt/{gtk-engines-qt-0.7_p20070327.ebuild => gtk-engines-qt-0.7_p20070327-r1.ebuild} (77%) diff --git a/x11-themes/gtk-engines-qt/ChangeLog b/x11-themes/gtk-engines-qt/ChangeLog index 19b84b17cf63..ec6de06ae474 100644 --- a/x11-themes/gtk-engines-qt/ChangeLog +++ b/x11-themes/gtk-engines-qt/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for x11-themes/gtk-engines-qt # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.16 2007/04/24 19:44:37 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.17 2007/04/24 19:49:52 genstef Exp $ + +*gtk-engines-qt-0.7_p20070327-r1 (24 Apr 2007) + + 24 Apr 2007; Stefan Schweizer + -files/gtk-engines-qt-0.7-implicit.patch, + -files/kcmgtk-write-good-bashrc.diff, -gtk-engines-qt-0.7-r1.ebuild, + -gtk-engines-qt-0.7_p20070327.ebuild, + +gtk-engines-qt-0.7_p20070327-r1.ebuild: + Fix bogus install locations thanks to Yaroslav Isakov + in bug 175611, remove old broken ebuilds 24 Apr 2007; Markus Ullmann gtk-engines-qt-0.7_p20070327.ebuild: @@ -8,7 +18,7 @@ *gtk-engines-qt-0.7_p20070327 (06 Apr 2007) - 06 Apr 2007; +gtk-engines-qt-0.7_p20070327.ebuild: + 06 Apr 2007; Stefan Schweizer +gtk-engines-qt-0.7_p20070327.ebuild: SVN Snapshot many thanks to Cedric Anderson in bug 171372 22 Mar 2007; Markus Ullmann ChangeLog: diff --git a/x11-themes/gtk-engines-qt/Manifest b/x11-themes/gtk-engines-qt/Manifest index ff0adf090f9a..4ebe076a47ea 100644 --- a/x11-themes/gtk-engines-qt/Manifest +++ b/x11-themes/gtk-engines-qt/Manifest @@ -1,42 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX gtk-engines-qt-0.7-implicit.patch 325 RMD160 f000122c61b329fbdc9db23f29f91c2b219c6284 SHA1 ce498f0db5e38a19984ff9180a2ec271d3ac215a SHA256 a47ad6e71b97c9160cc06af4a5e7ef219fd0753e3341e5c75a22d81ab0ab56d1 -MD5 f25a0d9a13e4db5a338ae90928ec40cf files/gtk-engines-qt-0.7-implicit.patch 325 -RMD160 f000122c61b329fbdc9db23f29f91c2b219c6284 files/gtk-engines-qt-0.7-implicit.patch 325 -SHA256 a47ad6e71b97c9160cc06af4a5e7ef219fd0753e3341e5c75a22d81ab0ab56d1 files/gtk-engines-qt-0.7-implicit.patch 325 -AUX kcmgtk-write-good-bashrc.diff 813 RMD160 4b9091390cd3b1d1059f9317dd4e4b218b1b70df SHA1 53013bf090d35a6b3672c3cdc10f20237a9f842e SHA256 27ef1031724098724cc76bd9727168c6316e90b2477ffbb5f0d961f90548b14f -MD5 acc187b85188f96c88861a94875064ec files/kcmgtk-write-good-bashrc.diff 813 -RMD160 4b9091390cd3b1d1059f9317dd4e4b218b1b70df files/kcmgtk-write-good-bashrc.diff 813 -SHA256 27ef1031724098724cc76bd9727168c6316e90b2477ffbb5f0d961f90548b14f files/kcmgtk-write-good-bashrc.diff 813 -DIST gtk-qt-engine-0.7.tar.bz2 439794 RMD160 5030cd453b58e2f22976b383ebc1f6aec202910c SHA1 7e0df095171112e79b3bc8bee13287bb0e1cea2a SHA256 cfaac46c409984afbcf46979f728515535725e8c83bdf70277f23dde068daaee DIST gtk-qt-engine-0.7_p20070327.tar.bz2 73202 RMD160 517abee1ddc2d9c7d65d47b22f4bc7a6e3cae785 SHA1 c1ae9bc6bc1a55283bc5ecba598f4c3446da6298 SHA256 c2a39f778da686b1ed45e4f4047441cbdb43d710150813ded80956758f6d876a -EBUILD gtk-engines-qt-0.7-r1.ebuild 1211 RMD160 4ed27a2071b210848a3a5afb772dfc20ec21331d SHA1 f06e71513e90cf1e387670e7f8d31364189dc0a7 SHA256 ead1491bd4ca1962cb0f49cefffbdc48bf272595ebc1f77ed62f3f660fa37337 -MD5 06c314f62a2a0bf86bb1c927c1dfaf77 gtk-engines-qt-0.7-r1.ebuild 1211 -RMD160 4ed27a2071b210848a3a5afb772dfc20ec21331d gtk-engines-qt-0.7-r1.ebuild 1211 -SHA256 ead1491bd4ca1962cb0f49cefffbdc48bf272595ebc1f77ed62f3f660fa37337 gtk-engines-qt-0.7-r1.ebuild 1211 -EBUILD gtk-engines-qt-0.7_p20070327.ebuild 668 RMD160 5b0d3851ea1a5478f122d5045f602f49e5938fcf SHA1 bcae5ffe80c8bd196d879546f1b91db28c07b67d SHA256 eee09e1fc1a5233b04396d6c6a26b2b94bc60931cc111f0c1da0ef65bf323c77 -MD5 3667b0c9c033cafaa4945c8da0e5f091 gtk-engines-qt-0.7_p20070327.ebuild 668 -RMD160 5b0d3851ea1a5478f122d5045f602f49e5938fcf gtk-engines-qt-0.7_p20070327.ebuild 668 -SHA256 eee09e1fc1a5233b04396d6c6a26b2b94bc60931cc111f0c1da0ef65bf323c77 gtk-engines-qt-0.7_p20070327.ebuild 668 -MISC ChangeLog 4422 RMD160 ddea6582eb1039bc6a774fecffe80580cbd4dcd6 SHA1 396bed4d10cb454fd426de985dc2bd936c9ed790 SHA256 65d0bc0d2a03ac9200b12b6e2175c20b145939f46daf1d682e03f609925f7d28 -MD5 f9cf123d4de6fc55e314537e184a1f9d ChangeLog 4422 -RMD160 ddea6582eb1039bc6a774fecffe80580cbd4dcd6 ChangeLog 4422 -SHA256 65d0bc0d2a03ac9200b12b6e2175c20b145939f46daf1d682e03f609925f7d28 ChangeLog 4422 +EBUILD gtk-engines-qt-0.7_p20070327-r1.ebuild 771 RMD160 0b19c792ae343699a449e09b0f45550d95353fea SHA1 3b66210e1b23f48d41783346f8a69e593cd2dbff SHA256 a489ee963a242f97a5b77b5366f8265e1c1a43043d174957fe14ecafaee8aa37 +MD5 4cefc0a51c8c3dee990751dda4a744de gtk-engines-qt-0.7_p20070327-r1.ebuild 771 +RMD160 0b19c792ae343699a449e09b0f45550d95353fea gtk-engines-qt-0.7_p20070327-r1.ebuild 771 +SHA256 a489ee963a242f97a5b77b5366f8265e1c1a43043d174957fe14ecafaee8aa37 gtk-engines-qt-0.7_p20070327-r1.ebuild 771 +MISC ChangeLog 4864 RMD160 3351188068fd29c3a6c22c0f09fa5f1f9b535e9e SHA1 c5870dd5138f4fdf8ded50a04a310acaa83705cf SHA256 93b538c04f7d5b79453cbd6c3e58a5a43131825de6d9420e7122e79df6f90f8d +MD5 179379bc04dc2a8283a52342ad0ecd34 ChangeLog 4864 +RMD160 3351188068fd29c3a6c22c0f09fa5f1f9b535e9e ChangeLog 4864 +SHA256 93b538c04f7d5b79453cbd6c3e58a5a43131825de6d9420e7122e79df6f90f8d ChangeLog 4864 MISC metadata.xml 202 RMD160 75345465bb5794b30965e4674f0269f134e920ee SHA1 a174ba2f788b85cd991e2295c22b72feb185026b SHA256 9cb2f3c693eec8648c11c76441dd7840340753bd4e31c2e1d45b412b23150c84 MD5 d102d93b9c48e7510b853ebca5891654 metadata.xml 202 RMD160 75345465bb5794b30965e4674f0269f134e920ee metadata.xml 202 SHA256 9cb2f3c693eec8648c11c76441dd7840340753bd4e31c2e1d45b412b23150c84 metadata.xml 202 -MD5 ea817b696943f4a74042c4c4ccf58f14 files/digest-gtk-engines-qt-0.7-r1 256 -RMD160 8c68d26a969b65e106c8b4722f0d30d766b80515 files/digest-gtk-engines-qt-0.7-r1 256 -SHA256 e978ee25d4ce3f4c4b3af5257a02645066777a435a9a2ab0dba879b78e884da4 files/digest-gtk-engines-qt-0.7-r1 256 -MD5 307535b6c5bb7577f2ac6de0acaa745e files/digest-gtk-engines-qt-0.7_p20070327 283 -RMD160 64185606bb3862854552c92967912dbb49ff83b2 files/digest-gtk-engines-qt-0.7_p20070327 283 -SHA256 cdb1dd0111c56647fecfbe3db2719d73c2cb0f5ed7ef4861e50812d5554545bc files/digest-gtk-engines-qt-0.7_p20070327 283 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGLl4wz974XjDVpbkRAqtfAKCRnpDM6YBTVrtr4ZnORira3XE/2QCeO/QL -OGan80mRaKhA6Y3HgaYeosM= -=aUoK ------END PGP SIGNATURE----- +MD5 307535b6c5bb7577f2ac6de0acaa745e files/digest-gtk-engines-qt-0.7_p20070327-r1 283 +RMD160 64185606bb3862854552c92967912dbb49ff83b2 files/digest-gtk-engines-qt-0.7_p20070327-r1 283 +SHA256 cdb1dd0111c56647fecfbe3db2719d73c2cb0f5ed7ef4861e50812d5554545bc files/digest-gtk-engines-qt-0.7_p20070327-r1 283 diff --git a/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.7-r1 b/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.7-r1 deleted file mode 100644 index e742471cdbe0..000000000000 --- a/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.7-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 27ca211621f38c45b1c4c9e9ef1f84b0 gtk-qt-engine-0.7.tar.bz2 439794 -RMD160 5030cd453b58e2f22976b383ebc1f6aec202910c gtk-qt-engine-0.7.tar.bz2 439794 -SHA256 cfaac46c409984afbcf46979f728515535725e8c83bdf70277f23dde068daaee gtk-qt-engine-0.7.tar.bz2 439794 diff --git a/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.7_p20070327 b/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.7_p20070327-r1 similarity index 100% rename from x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.7_p20070327 rename to x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.7_p20070327-r1 diff --git a/x11-themes/gtk-engines-qt/files/gtk-engines-qt-0.7-implicit.patch b/x11-themes/gtk-engines-qt/files/gtk-engines-qt-0.7-implicit.patch deleted file mode 100644 index 1f8d1dbc358c..000000000000 --- a/x11-themes/gtk-engines-qt/files/gtk-engines-qt-0.7-implicit.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: gtk-qt-engine-0.6_p20060706/src/qt_rc_style.c -=================================================================== ---- gtk-qt-engine-0.6_p20060706.orig/src/qt_rc_style.c -+++ gtk-qt-engine-0.6_p20060706/src/qt_rc_style.c -@@ -1,5 +1,6 @@ - #include "qt_rc_style.h" - #include "qt_style.h" -+#include "qt_qt_wrapper.h" - - - diff --git a/x11-themes/gtk-engines-qt/files/kcmgtk-write-good-bashrc.diff b/x11-themes/gtk-engines-qt/files/kcmgtk-write-good-bashrc.diff deleted file mode 100644 index 73c323515f82..000000000000 --- a/x11-themes/gtk-engines-qt/files/kcmgtk-write-good-bashrc.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.orig 2006-08-16 11:41:56.000000000 +0200 -+++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp 2006-08-16 11:42:00.000000000 +0200 -@@ -314,7 +314,7 @@ - if (line.isNull()) - break; - -- if (line.stripWhiteSpace().startsWith("export GTK2_RC_FILES=$HOME/.gtkrc-2.0")) -+ if (line.stripWhiteSpace().startsWith("export GTK2_RC_FILES=\"$HOME/.gtkrc-2.0:$HOME/.kde/share/config/gtkrc-2.0:/etc/gtk-2.0/gtkrc\"")) - { - found = true; - break; -@@ -326,7 +326,7 @@ - stream << "\n"; - stream << "# This line was appended by KDE\n"; - stream << "# Make sure our customised gtkrc file is loaded.\n"; -- stream << "export GTK2_RC_FILES=$HOME/.gtkrc-2.0\n"; -+ stream << "export GTK2_RC_FILES=\"$HOME/.gtkrc-2.0:$HOME/.kde/share/config/gtkrc-2.0:/etc/gtk-2.0/gtkrc\"\n"; - } - file.close(); - diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7-r1.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7-r1.ebuild deleted file mode 100644 index 38a8b83fdb66..000000000000 --- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7-r1.ebuild,v 1.4 2007/03/22 16:46:06 jokey Exp $ - -inherit kde eutils - -MY_PN="gtk-qt-engine" -DESCRIPTION="GTK+2 Qt Theme Engine" -HOMEPAGE="http://gtk-qt.ecs.soton.ac.uk" -SRC_URI="http://www.freedesktop.org/~davidsansome/${MY_PN}-${PV}.tar.bz2" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~sparc x86" - -DEPEND="${DEPEND} - >=x11-libs/gtk+-2.2" - -need-kde 3 -# Set slot after the need-kde. Fixes bug #78455. -SLOT="2" - -S=${WORKDIR}/${MY_PN} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/gtk-engines-qt-0.7-implicit.patch - epatch ${FILESDIR}/kcmgtk-write-good-bashrc.diff -} - -src_install() { - kde_src_install - # remove duplicate .desktop - rm ${D}/usr/share/applnk/Settings/LookNFeel/kcmgtk.desktop - # Add environment variable - dodir /etc/X11/xinit/xinitrc.d - echo 'export GTK2_RC_FILES="$HOME/.gtkrc-2.0:$HOME/.kde/share/config/gtkrc-2.0:/etc/gtk-2.0/gtkrc"' \ - >> ${D}/etc/X11/xinit/xinitrc.d/${PN} - fperms a+x /etc/X11/xinit/xinitrc.d/${PN} -} - -pkg_postinst() { - ewarn "This crashes gnome, see http://bugs.gentoo.org/105092" -} diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7_p20070327.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7_p20070327-r1.ebuild similarity index 77% rename from x11-themes/gtk-engines-qt/gtk-engines-qt-0.7_p20070327.ebuild rename to x11-themes/gtk-engines-qt/gtk-engines-qt-0.7_p20070327-r1.ebuild index be8698dc33cd..6935eee90f31 100644 --- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7_p20070327.ebuild +++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7_p20070327-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7_p20070327.ebuild,v 1.2 2007/04/24 19:44:37 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7_p20070327-r1.ebuild,v 1.1 2007/04/24 19:49:52 genstef Exp $ ARTS_REQUIRED="never" @@ -22,3 +22,8 @@ need-kde 3 SLOT="2" S=${WORKDIR}/${MY_PN}-${PV} + +src_install() { + kde_src_install + mv ${D}/usr/local/share/{locale,application} ${D}/usr/share/ +} -- 2.26.2