diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-03-05 02:21:01 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-03-05 02:21:01 +0000 |
| commit | 11bc02fcd27d8dee1963f45ecce07a5914203e90 (patch) | |
| tree | ce3043585b1bc2d0a8fd17c1a0231560ec91c5da /app-misc | |
| parent | New PHP versions, fix lots of bugs, add Suhosin support. (diff) | |
| download | gentoo-2-11bc02fcd27d8dee1963f45ecce07a5914203e90.tar.gz gentoo-2-11bc02fcd27d8dee1963f45ecce07a5914203e90.tar.bz2 gentoo-2-11bc02fcd27d8dee1963f45ecce07a5914203e90.zip | |
Cleanup more packaging crap that gwine bundles #169370 by Fatal1ty.
(Portage version: 2.1.2-r14)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/gwine/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/gwine/files/gwine-0.10.1-package.patch | 38 | ||||
| -rw-r--r-- | app-misc/gwine/gwine-0.10.1.ebuild | 9 |
3 files changed, 47 insertions, 6 deletions
diff --git a/app-misc/gwine/ChangeLog b/app-misc/gwine/ChangeLog index 64b42e41a353..d6bba4ab2b79 100644 --- a/app-misc/gwine/ChangeLog +++ b/app-misc/gwine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/gwine # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gwine/ChangeLog,v 1.8 2007/01/19 22:02:03 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gwine/ChangeLog,v 1.9 2007/03/05 02:21:01 vapier Exp $ + + 05 Mar 2007; Mike Frysinger <vapier@gentoo.org> + +files/gwine-0.10.1-package.patch, gwine-0.10.1.ebuild: + Cleanup more packaging crap that gwine bundles #169370 by Fatal1ty. 19 Jan 2007; Michael Cummings <mcummings@gentoo.org> gwine-0.10.1.ebuild: Keywording amd64 stable diff --git a/app-misc/gwine/files/gwine-0.10.1-package.patch b/app-misc/gwine/files/gwine-0.10.1-package.patch new file mode 100644 index 000000000000..b9dc249f6407 --- /dev/null +++ b/app-misc/gwine/files/gwine-0.10.1-package.patch @@ -0,0 +1,38 @@ +let portage handle the packaging details + +--- Makefile.PL ++++ Makefile.PL +@@ -232,9 +232,7 @@ + + ########################################### + ## Install Free Desktop files +- my $INSTALL_DIRS = ''; +- if (exists $ENV{XDG_DATA_DIRS}) { $INSTALL_DIRS = '$(XDG_DATA_DIRS)' } +- else { $INSTALL_DIRS = '$(DESTDIR)$(PREFIX)/share' } ++ my $INSTALL_DIRS = '$(DESTDIR)$(PREFIX)/share'; + + ## Install gwine.desktop + my $desktop_install = "\tinstall -d $INSTALL_DIRS/applications/\n"; +@@ -244,21 +242,16 @@ + ## Install gwine.xml + my $mime_install = "\tinstall -d $INSTALL_DIRS/mime/packages/\n"; + $mime_install .= "\tinstall -m 644 gwine.xml $INSTALL_DIRS/mime/packages/gwine.xml\n"; +- $mime_install .= "\tupdate-mime-database $INSTALL_DIRS/mime\n" unless $::deb_pkg; + my $mime_uninstall = "\trm -f $INSTALL_DIRS/mime/packages/gwine.xml\n"; + + ########################################### + ## Install gconf schemas + my $gconf_install = ''; + my $gconf_uninstall = ''; +- if ($::install_gconf_schema) { +- $gconf_install = "\tgconftool --install-schema-file=gwine.schemas\n" +- } elsif ($::deb_pkg) { + # Place schema in /etc/gconf/schemas (it seems dh_gconf searches here) + $gconf_install = "\tinstall -d \$(DESTDIR)/etc/gconf/schemas\n"; + $gconf_install .= "\tinstall -m 644 gwine.schemas \$(DESTDIR)/etc/gconf/schemas\n"; +- $gconf_uninstall = "\trm \$(DESTDIR)/etc/gconf/schemas\n" ++ $gconf_uninstall = "\trm \$(DESTDIR)/etc/gconf/schemas\n"; +- } + + <<EOT; + $update_mo diff --git a/app-misc/gwine/gwine-0.10.1.ebuild b/app-misc/gwine/gwine-0.10.1.ebuild index 9c3f0ce8e224..fd8bb55ed03f 100644 --- a/app-misc/gwine/gwine-0.10.1.ebuild +++ b/app-misc/gwine/gwine-0.10.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gwine/gwine-0.10.1.ebuild,v 1.4 2007/01/19 22:02:03 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gwine/gwine-0.10.1.ebuild,v 1.5 2007/03/05 02:21:01 vapier Exp $ -inherit gnome2 perl-app +inherit eutils gnome2 perl-app DESCRIPTION="Gnome application to manage your wine cellar" HOMEPAGE="http://home.gna.org/gwine/" @@ -24,9 +24,8 @@ DEPEND=">=dev-lang/perl-5.8.0 src_unpack() { unpack ${A} - sed -i \ - -e 's:gconftool:echo:' \ - "${S}"/Makefile.PL || die + cd "${S}" + epatch "${FILESDIR}"/${P}-package.patch } pkg_postinst() { |