diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2006-04-24 11:15:04 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2006-04-24 11:15:04 +0000 |
| commit | 9f9dd5921b1193211814c3d5c66dff28a95afe11 (patch) | |
| tree | d099f93d8ffed487ea1c473ec332d3f05450d392 /kde-misc | |
| parent | Add patch to build with --as-needed. (diff) | |
| download | gentoo-2-9f9dd5921b1193211814c3d5c66dff28a95afe11.tar.gz gentoo-2-9f9dd5921b1193211814c3d5c66dff28a95afe11.tar.bz2 gentoo-2-9f9dd5921b1193211814c3d5c66dff28a95afe11.zip | |
remove file collision of xConfigurator.png provided by kxdocker-resources. bug #130872
(Portage version: 2.1_pre9-r4)
Diffstat (limited to 'kde-misc')
3 files changed, 40 insertions, 2 deletions
diff --git a/kde-misc/kxdocker-configurator/ChangeLog b/kde-misc/kxdocker-configurator/ChangeLog index 1d47d447bb6d..b7c35de03220 100644 --- a/kde-misc/kxdocker-configurator/ChangeLog +++ b/kde-misc/kxdocker-configurator/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-misc/kxdocker-configurator # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker-configurator/ChangeLog,v 1.1 2006/04/22 03:50:22 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker-configurator/ChangeLog,v 1.2 2006/04/24 11:15:04 dragonheart Exp $ + + 24 Apr 2006; Daniel Black <dragonheart@gentoo.org> + +files/kxdocker-configurator-1.0.2-collisions.patch, + kxdocker-configurator-1.0.2.ebuild: + remove file collision of xConfigurator.png provided by kxdocker-resources. + bug #130872 thanks to Alessio Cassibba *kxdocker-configurator-1.0.2 (22 Apr 2006) diff --git a/kde-misc/kxdocker-configurator/files/kxdocker-configurator-1.0.2-collisions.patch b/kde-misc/kxdocker-configurator/files/kxdocker-configurator-1.0.2-collisions.patch new file mode 100644 index 000000000000..c5cb379f1ade --- /dev/null +++ b/kde-misc/kxdocker-configurator/files/kxdocker-configurator-1.0.2-collisions.patch @@ -0,0 +1,25 @@ +--- addons/Makefile.in.orig 2006-04-24 03:38:02.000000000 +0200 ++++ addons/Makefile.in 2006-04-24 03:41:38.000000000 +0200 +@@ -278,21 +278,18 @@ + TAR= tar + TAROPT= -mjxf + +-all: xConfigurator.png addons_50_configurator.xml ++all: addons_50_configurator.xml + + distcheck: + -echo distcheck + install: + $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kxdocker/xml + $(INSTALL_DATA) addons_50_configurator.xml $(DESTDIR)$(kde_datadir)/kxdocker/xml +- $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kxdocker/themes/icons +- $(INSTALL_DATA) xConfigurator.png $(DESTDIR)$(kde_datadir)/kxdocker/themes/icons + $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kxdocker/plugins/configurator/sponsors/ + $(INSTALL_DATA) sponsor00.png $(DESTDIR)$(kde_datadir)/kxdocker/plugins/configurator/sponsors/ + $(INSTALL_DATA) sponsor01.png $(DESTDIR)$(kde_datadir)/kxdocker/plugins/configurator/sponsors/ + uninstall: + -rm -f $(DESTDIR)$(kde_datadir)/kxdocker/xml/addons_50_configurator.xml +- -rm -f $(DESTDIR)$(kde_datadir)/kxdocker/themes/icons/xConfigurator.png + + installcheck: + -echo install Check diff --git a/kde-misc/kxdocker-configurator/kxdocker-configurator-1.0.2.ebuild b/kde-misc/kxdocker-configurator/kxdocker-configurator-1.0.2.ebuild index 6bec5405e7b9..6c83c4172bce 100644 --- a/kde-misc/kxdocker-configurator/kxdocker-configurator-1.0.2.ebuild +++ b/kde-misc/kxdocker-configurator/kxdocker-configurator-1.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker-configurator/kxdocker-configurator-1.0.2.ebuild,v 1.1 2006/04/22 03:50:22 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker-configurator/kxdocker-configurator-1.0.2.ebuild,v 1.2 2006/04/24 11:15:03 dragonheart Exp $ inherit kde @@ -16,3 +16,10 @@ IUSE="" DEPEND=">=kde-misc/kxdocker-1.1.3a" need-kde 3.2 + +src_unpack() { + unpack ${A} + cd "${S}" + epatch ${FILESDIR}/${P}-collisions.patch +} + |