Patch Makefile to respect DESTDIR, fixing also bug 152022. Thanks to Lars for reporting.

Package-Manager: portage-2.1.3

6 files changed, 90 insertions, 62 deletions

diff --git a/media-sound/darksnow/ChangeLog b/media-sound/darksnow/ChangeLog
index 0fef6e2700ff..5551808e4a7f 100644
--- a/media-sound/darksnow/ChangeLog
+++ b/media-sound/darksnow/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/darksnow
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darksnow/ChangeLog,v 1.9 2006/10/08 05:46:32 matsuu Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darksnow/ChangeLog,v 1.10 2007/07/28 12:42:33 drac Exp $
+
+  28 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/darksnow-0.6.1-Makefile.patch, darksnow-0.6.1.ebuild:
+  Patch Makefile to respect DESTDIR, fixing also bug 152022. Thanks to Lars
+  for reporting.
 
 *darksnow-0.6.1 (08 Oct 2006)
 
diff --git a/media-sound/darksnow/Manifest b/media-sound/darksnow/Manifest
index 1739f93fe791..fb53921b943e 100644
--- a/media-sound/darksnow/Manifest
+++ b/media-sound/darksnow/Manifest
@@ -1,22 +1,21 @@
+AUX darksnow-0.6.1-Makefile.patch 1977 RMD160 851926d9e478796b01eb126ca84366145e4e4849 SHA1 7674630788e2eee035f3c94a99ad9cba25a3c94d SHA256 760d4d2a188e07d09654057869a7132e45ae4f4dd2996c67d705222e160ca94b
+MD5 3150a136617905974ee9a5aab65ad8d0 files/darksnow-0.6.1-Makefile.patch 1977
+RMD160 851926d9e478796b01eb126ca84366145e4e4849 files/darksnow-0.6.1-Makefile.patch 1977
+SHA256 760d4d2a188e07d09654057869a7132e45ae4f4dd2996c67d705222e160ca94b files/darksnow-0.6.1-Makefile.patch 1977
 DIST darksnow-0.4.4.tar.gz 21636 RMD160 79dfbb188031a2548200c3f0407c8663bf9536a3 SHA1 b9ff0c22bcc139adc573c4d2ed5e3251f043cb5a SHA256 66ff37ba94ff3f0ec94e7d07abda260eac16c289a77d7244f346a9d5e903f396
-DIST darksnow-0.5.tar.gz 51353 RMD160 e80bf82482bb42928fffde4682066f964771d34a SHA1 ad3a894fd312b71b263ed07f1e3463c0d8160aaa SHA256 9eaf3f6af27dedc49fda2a9b193239d505fdbd993d8823f455078cc68c8d3ec2
 DIST darksnow-0.6.1.tar.gz 61603 RMD160 95de5706b99d16cdd8e36484de6acc985b581bf4 SHA1 27d0e856ba9c1e599a9ed87ea5d3533e404e43fd SHA256 4b206546738700bf155219f528793bb5c45d221d9b8aa0ab1177b42dea5634ff
 EBUILD darksnow-0.4.4.ebuild 949 RMD160 acbd969cee06cd278b5679a63dff1856b854062c SHA1 716f736847d71f74fce4b78ed683610a82872c26 SHA256 85768e279c38e7906bce8ddbdba4fad5634da1e855885a6402c61d488f94b19a
 MD5 d24d5d1264c01757904d8fb178e91048 darksnow-0.4.4.ebuild 949
 RMD160 acbd969cee06cd278b5679a63dff1856b854062c darksnow-0.4.4.ebuild 949
 SHA256 85768e279c38e7906bce8ddbdba4fad5634da1e855885a6402c61d488f94b19a darksnow-0.4.4.ebuild 949
-EBUILD darksnow-0.5.ebuild 891 RMD160 a698ff4b2f9017182e7891701bb4472ea91be3ec SHA1 ab848820d793e2290ef63cd5dd27f06d9b4913d3 SHA256 673112e85e1a05a2cdd3032cb91e5b73d2a78be78c07ad8befd0036c13aa1829
-MD5 11de9c856b323f3470b8725262e1e3ee darksnow-0.5.ebuild 891
-RMD160 a698ff4b2f9017182e7891701bb4472ea91be3ec darksnow-0.5.ebuild 891
-SHA256 673112e85e1a05a2cdd3032cb91e5b73d2a78be78c07ad8befd0036c13aa1829 darksnow-0.5.ebuild 891
-EBUILD darksnow-0.6.1.ebuild 663 RMD160 c5ec25dc3f49972392eb94b3147a9debde6fbabd SHA1 d9e1c50a98e3cdf66d07e43febab79cfa800f09f SHA256 7c2c900afa8028980b457ccaa087aee00e1b0fdd168cb7f1756d8e5b86c3417e
-MD5 084ebeb349a6d6157df853525feb1c37 darksnow-0.6.1.ebuild 663
-RMD160 c5ec25dc3f49972392eb94b3147a9debde6fbabd darksnow-0.6.1.ebuild 663
-SHA256 7c2c900afa8028980b457ccaa087aee00e1b0fdd168cb7f1756d8e5b86c3417e darksnow-0.6.1.ebuild 663
-MISC ChangeLog 1365 RMD160 d948a30257f8bf2ae320b93221d87f4fae4da0e2 SHA1 fff5353412816ebf0395fad39abef540714864a7 SHA256 feabfbaa3b77f37fd1e5ffe58315d321d45838af6a2c3c8b71a9195c4c6ee16f
-MD5 97b14e9b1cbd5ff85638897a5ae5f361 ChangeLog 1365
-RMD160 d948a30257f8bf2ae320b93221d87f4fae4da0e2 ChangeLog 1365
-SHA256 feabfbaa3b77f37fd1e5ffe58315d321d45838af6a2c3c8b71a9195c4c6ee16f ChangeLog 1365
+EBUILD darksnow-0.6.1.ebuild 935 RMD160 db83c5a8e120dfe5c1fc9692b578f3b1c8203cf1 SHA1 487f85ed97cb39a6cf65cbe6000dcb369381e2a4 SHA256 ff3fb7490b2541ad6df010a9d2530b5324e2e4d7f9c8fd5f8cace44941f4ab12
+MD5 74dcac23eaabe00d75ef14c4159e203a darksnow-0.6.1.ebuild 935
+RMD160 db83c5a8e120dfe5c1fc9692b578f3b1c8203cf1 darksnow-0.6.1.ebuild 935
+SHA256 ff3fb7490b2541ad6df010a9d2530b5324e2e4d7f9c8fd5f8cace44941f4ab12 darksnow-0.6.1.ebuild 935
+MISC ChangeLog 1570 RMD160 478bbc23b4dc86e7755af68421bbf3f9e8f34e4b SHA1 e2cefaf70feb91c955c38c5df77fba4d368dc581 SHA256 b8aca47da1301a9798b7aa3f32e0f63c08750282edfa242358d7ca0e22f3eab5
+MD5 75785f6f7019cd922b6c65c2f75751eb ChangeLog 1570
+RMD160 478bbc23b4dc86e7755af68421bbf3f9e8f34e4b ChangeLog 1570
+SHA256 b8aca47da1301a9798b7aa3f32e0f63c08750282edfa242358d7ca0e22f3eab5 ChangeLog 1570
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -24,9 +23,6 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 da63034bee9887b13d06fc0c346f7c68 files/digest-darksnow-0.4.4 241
 RMD160 c5d7620b093fca84b0272b356eb5b2a2639fb4ae files/digest-darksnow-0.4.4 241
 SHA256 ddbea6fb703f3d19ba12e7459f2e5cfb4d0482039eb8b12f38410a45f60f58ba files/digest-darksnow-0.4.4 241
-MD5 1f471bac700fcfd9b03371c4d48df1cf files/digest-darksnow-0.5 235
-RMD160 14d167452f968ffcd495664326b56e5ae9cb9f02 files/digest-darksnow-0.5 235
-SHA256 11ed6160bf5718266351eb943bc555af9e12d3e4777b1b22b279989b337148b6 files/digest-darksnow-0.5 235
 MD5 94cfd714d2f7285744ceb227314b8c63 files/digest-darksnow-0.6.1 241
 RMD160 e3fab105c9d2611731210e054cd3d59745a760c7 files/digest-darksnow-0.6.1 241
 SHA256 53d88f73499e5d8e71c1cad21dc64e9170e60a2cbb24a1fa26afe4989aedb705 files/digest-darksnow-0.6.1 241
diff --git a/media-sound/darksnow/darksnow-0.5.ebuild b/media-sound/darksnow/darksnow-0.5.ebuild
deleted file mode 100644
index 9df7e472bbc3..000000000000
--- a/media-sound/darksnow/darksnow-0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darksnow/darksnow-0.5.ebuild,v 1.3 2007/07/11 19:30:24 mr_bones_ Exp $
-
-DESCRIPTION="Streaming GTK2 Front-End based in Darkice Ice Streamer"
-HOMEPAGE="http://darksnow.radiolivre.org"
-SRC_URI="http://darksnow.radiolivre.org/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2
-	>=media-sound/darkice-0.14"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	#fix some makefile issues
-	sed -i -e "s:^PREFIX=.*:PREFIX=${D}/usr:" \
-	-e "s:^INTLPREFIX=.*:INTLPREFIX=${D}/usr:" \
-	-e "s:^CFLAGS=:CFLAGS=${CFLAGS} :" \
-	Makefile.in \
-	|| die "could not patch Makefile"
-}
-
-src_install () {
-	dobin darksnow || die "could not install darksnow executable"
-	dodoc ${S}/documentation/{CHANGES,README.en}
-}
diff --git a/media-sound/darksnow/darksnow-0.6.1.ebuild b/media-sound/darksnow/darksnow-0.6.1.ebuild
index d74fd5536ed3..ac3736408c5b 100644
--- a/media-sound/darksnow/darksnow-0.6.1.ebuild
+++ b/media-sound/darksnow/darksnow-0.6.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darksnow/darksnow-0.6.1.ebuild,v 1.1 2006/10/08 05:46:32 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darksnow/darksnow-0.6.1.ebuild,v 1.2 2007/07/28 12:42:33 drac Exp $
 
-DESCRIPTION="Streaming GTK2 Front-End based in Darkice Ice Streamer"
+inherit eutils gnome2-utils
+
+DESCRIPTION="Streaming GTK+ Front-End based in Darkice Ice Streamer"
 HOMEPAGE="http://darksnow.radiolivre.org"
 SRC_URI="http://darksnow.radiolivre.org/${P}.tar.gz"
 
@@ -11,11 +13,27 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=x11-libs/gtk+-2"
-RDEPEND="${DEPEND}
-	>=media-sound/darkice-0.14"
+PDEPEND=">=media-sound/darkice-0.14"
+RDEPEND=">=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc documentation/{CHANGES,CREDITS,README*}
+	make_desktop_entry ${PN} "DarkSnow" ${PN}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
 
-src_install () {
-	dobin darksnow || die "could not install darksnow executable"
-	dodoc "${S}"/documentation/{CHANGES,README*}
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/media-sound/darksnow/files/darksnow-0.6.1-Makefile.patch b/media-sound/darksnow/files/darksnow-0.6.1-Makefile.patch
new file mode 100644
index 000000000000..ea48b1765409
--- /dev/null
+++ b/media-sound/darksnow/files/darksnow-0.6.1-Makefile.patch
@@ -0,0 +1,44 @@
+diff -ur darksnow-0.6.1.orig/Makefile.in darksnow-0.6.1/Makefile.in
+--- darksnow-0.6.1.orig/Makefile.in	2006-05-21 18:07:04.000000000 +0300
++++ darksnow-0.6.1/Makefile.in	2007-07-28 15:34:23.000000000 +0300
+@@ -37,7 +37,7 @@
+ 
+ all: darksnow
+ 
+-darksnow: darksnow.o interface.o config_files.o tooltips.o man_gzip
++darksnow: darksnow.o interface.o config_files.o tooltips.o
+ 	$(CC) $(CFLAGS) @GTK_LIBS@ @GTK_CFLAGS@ -DVERSION="\"$(VERSION)\"" darksnow.o interface.o config_files.o tooltips.o -o darksnow 
+ 
+ darksnow.o: darksnow.c
+@@ -52,19 +52,15 @@
+ tooltips.o: tooltips.c
+ 	$(CC) $(CFLAGS) $(FUNNY) @GTK_CFLAGS@ -DINTLPREFIX="\"$(INTLPREFIX)\"" -DVERSION="\"$(VERSION)\"" -c tooltips.c -o tooltips.o
+ 
+-man_gzip:
+-	gzip -c man/darksnow.1 > man/darksnow.1.gz 
+-
+ clean:
+-	rm -f *.o *~ darksnow man/darksnow.1.gz
++	rm -f *.o *~ darksnow
+ 	rm -rf slack darksnow.tgz
+ 
+ install: darksnow
+-	$(INSTALL) -D --mode=0755 darksnow $(PREFIX)/bin/darksnow
+-	$(INSTALL) -D --mode=0644 documentation/CHANGES $(PREFIX)/share/darksnow/changelog
+-	$(INSTALL) -D --mode=0644 po/pt_BR.mo $(PREFIX)/share/locale/pt_BR/LC_MESSAGES/darksnow.mo
+-	$(INSTALL) -D --mode=0644 icon/darksnow_icon.png $(PREFIX)/share/icons/hicolor/32x32/apps/darksnow.png
+-	$(INSTALL) -D --mode=0644 man/darksnow.1.gz $(PREFIX)/share/man/man1/darksnow.1.gz
++	$(INSTALL) -D --mode=0755 darksnow $(DESTDIR)$(PREFIX)/bin/darksnow
++	$(INSTALL) -D --mode=0644 po/pt_BR.mo $(DESTDIR)$(PREFIX)/share/locale/pt_BR/LC_MESSAGES/darksnow.mo
++	$(INSTALL) -D --mode=0644 icon/darksnow_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/darksnow.png
++	$(INSTALL) -D --mode=0644 man/darksnow.1 $(DESTDIR)$(PREFIX)/share/man/man1/darksnow.1
+ 
+ make_pkg: darksnow
+ 	echo "Remember to run this option as root!"
+@@ -88,5 +84,5 @@
+ 	/sbin/upgradepkg darksnow-*-1rd.tgz
+ 
+ dist-clean: clean
+-	rm aclocal.m4 config.status config.log man/darksnow.1.gz Makefile
++	rm aclocal.m4 config.status config.log Makefile
+ 	rm -r autom4te.cache
diff --git a/media-sound/darksnow/files/digest-darksnow-0.5 b/media-sound/darksnow/files/digest-darksnow-0.5
deleted file mode 100644
index 73f6cf7a55f4..000000000000
--- a/media-sound/darksnow/files/digest-darksnow-0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a45126db84ce79770e6d563eff9bce44 darksnow-0.5.tar.gz 51353
-RMD160 e80bf82482bb42928fffde4682066f964771d34a darksnow-0.5.tar.gz 51353
-SHA256 9eaf3f6af27dedc49fda2a9b193239d505fdbd993d8823f455078cc68c8d3ec2 darksnow-0.5.tar.gz 51353