Cleanup more packaging crap that gwine bundles #169370 by Fatal1ty.

Package-Manager: portage-2.1.2-r14

diff --git a/app-misc/gwine/ChangeLog b/app-misc/gwine/ChangeLog
index 64b42e41a353f32da29f1103990cdf983cb8ff19..d6bba4ab2b7959546e79289623ab894149a7197a 100644 (file)
--- 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/Manifest b/app-misc/gwine/Manifest
index cb622ce248f448a0b7c98dcc2d46c87b9737d46f..d49e3532768bdfc175745991771fdc26b4509c25 100644 (file)
--- a/app-misc/gwine/Manifest
+++ b/app-misc/gwine/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gwine-0.10.1-package.patch 1528 RMD160 2a3fbd32f7e67ac6f95ae75b659ac2333fb73ab9 SHA1 7c2c0b993c22b4540844185f0a7e5e569a789a12 SHA256 8e2a4242ca63779c2bde1d2ad5caaefa1b30fc291394e4cff458e64282c0b639
+MD5 eacdaac697a968b0df8e286a04053bc0 files/gwine-0.10.1-package.patch 1528
+RMD160 2a3fbd32f7e67ac6f95ae75b659ac2333fb73ab9 files/gwine-0.10.1-package.patch 1528
+SHA256 8e2a4242ca63779c2bde1d2ad5caaefa1b30fc291394e4cff458e64282c0b639 files/gwine-0.10.1-package.patch 1528
 DIST gwine-0.10.1.tar.gz 73235 RMD160 1cccaa58eaaa32b3feb1d94e1d32bb82dc708023 SHA1 f632e23f66a01ed7e950a9d2d1bc3b34b0e72b81 SHA256 a099243c5ea41a5a3a90d5b5e8351072044d840ffb9b93c732caa3c70b564a02
 DIST gwine-0.7.1.tar.gz 43778 RMD160 04156d2804ba4f31291fdde4fec2e237d434a637 SHA1 56c923868e6ed66105827cb0883b7c32618fe585 SHA256 c46e3f6364780aad0b304772b0c691b7ff916aab04049c8c04d132cd4a039cf9
-EBUILD gwine-0.10.1.ebuild 832 RMD160 accb58708585824fba0c99cacf686e9c6c62751f SHA1 582d7b3ebdcfcf1e7ca3af1531a4c3686839079a SHA256 3b0a59e579a828f99d331b2548ea3f5929ec4686e68b3bd15aa22f6d82cb3e6e
-MD5 7b2d2af0bd5947a7a3df2c1f8321387f gwine-0.10.1.ebuild 832
-RMD160 accb58708585824fba0c99cacf686e9c6c62751f gwine-0.10.1.ebuild 832
-SHA256 3b0a59e579a828f99d331b2548ea3f5929ec4686e68b3bd15aa22f6d82cb3e6e gwine-0.10.1.ebuild 832
+EBUILD gwine-0.10.1.ebuild 823 RMD160 cea3951ea8d0680e827d873f38232ff416011705 SHA1 fb715a1f300e09b8667dcc77b8641310cda2912f SHA256 4001f93af0bd35784e83d9e1b056505268563391afccbb6cad0ef9ec30a7c01b
+MD5 924fead95cb1776b707594b9e81a0bc3 gwine-0.10.1.ebuild 823
+RMD160 cea3951ea8d0680e827d873f38232ff416011705 gwine-0.10.1.ebuild 823
+SHA256 4001f93af0bd35784e83d9e1b056505268563391afccbb6cad0ef9ec30a7c01b gwine-0.10.1.ebuild 823
 EBUILD gwine-0.7.1.ebuild 767 RMD160 8213dffceeb29d64c6e99c23c5cc5d69c7e83dd0 SHA1 e9571d1472ec8920fffae42a0e0291b4445be42e SHA256 8cd1e5c26e7e8e9624623fd3e659c61a12e8d4589eeeb962391ca63c46f7ef62
 MD5 2564b3f35dc90561aa03885a8e9e9ea1 gwine-0.7.1.ebuild 767
 RMD160 8213dffceeb29d64c6e99c23c5cc5d69c7e83dd0 gwine-0.7.1.ebuild 767
 SHA256 8cd1e5c26e7e8e9624623fd3e659c61a12e8d4589eeeb962391ca63c46f7ef62 gwine-0.7.1.ebuild 767
-MISC ChangeLog 1041 RMD160 d4c2a45d41462b6e9516e118fc1d1f4ce946d64c SHA1 a1970da97883cd3c30f435c55791d3f4e69edbd7 SHA256 7469c394eff4c5f9df6e04d8312f5b016a0ef8d52eca170f4eab93d6c9999037
-MD5 3fee853b8720cff9a2f9ca086cb780e2 ChangeLog 1041
-RMD160 d4c2a45d41462b6e9516e118fc1d1f4ce946d64c ChangeLog 1041
-SHA256 7469c394eff4c5f9df6e04d8312f5b016a0ef8d52eca170f4eab93d6c9999037 ChangeLog 1041
+MISC ChangeLog 1217 RMD160 10cb94bf62499ee20b7d5e0c4e762ca1bc14493d SHA1 7d0a76773b2b4e17e8620d07adc6cff136708f57 SHA256 0d5ca7823d25a7eeffc03ec2d71cce243ee296fd8cd0995085f0223fe06a9d94
+MD5 355a500ff5e0d1f4b42e0b91f4ffa8a3 ChangeLog 1217
+RMD160 10cb94bf62499ee20b7d5e0c4e762ca1bc14493d ChangeLog 1217
+SHA256 0d5ca7823d25a7eeffc03ec2d71cce243ee296fd8cd0995085f0223fe06a9d94 ChangeLog 1217
 MISC metadata.xml 307 RMD160 ac1b0d042d2ac4d423c083decdbf15e110b622ed SHA1 ab03fd1a6a83768eb126936b66dbde4bc0ad81f7 SHA256 072403dc241eea6427764a9ddfaaccebd889c697b3303981a287cd25a2b3e7e5
 MD5 1c7c625d5bcc66006c50cac1c6ead8a1 metadata.xml 307
 RMD160 ac1b0d042d2ac4d423c083decdbf15e110b622ed metadata.xml 307
@@ -26,9 +30,9 @@ MD5 f230a488638263575f3066c4b4213f6c files/digest-gwine-0.7.1 232
 RMD160 804d2196e46311a4ad7dbcfe1b38571f366a8f97 files/digest-gwine-0.7.1 232
 SHA256 515ac7d5d1b11f67c3e1caf87a1731fa0297be2a1dca84313d973f7a6bccbf88 files/digest-gwine-0.7.1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFsT/itG5z4I8BtQoRAjcsAJ9UmqyaVf9vY8KuZK3w4M9tAJkwxgCfRARl
-i5zOvCW/N7r2x6GJ1ce4DsY=
-=38we
+iD8DBQFF636Y8bi6rjpTunYRAlx6AJ9XuNj3hqOI6/xjYNIUdvqbA9nhWwCfcXfp
+Q2n2+W6blMt9OCCucHg0Cac=
+=NQRl
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..b9dc249
--- /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 9c3f0ce8e22411d3073578040d5426a55cba4d52..fd8bb55ed03f550b8b4d5d0412809f46b1cba307 100644 (file)
--- 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() {