Version bump for security bug #74702.

8 files changed, 36 insertions, 34 deletions

diff --git a/media-sound/abcm2ps/ChangeLog b/media-sound/abcm2ps/ChangeLog
index 485b7e5e0f69..158e89bd69d1 100644
--- a/media-sound/abcm2ps/ChangeLog
+++ b/media-sound/abcm2ps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/abcm2ps
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/ChangeLog,v 1.8 2004/09/14 07:16:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/ChangeLog,v 1.9 2004/12/19 01:32:59 eradicator Exp $
+
+*abcm2ps-3.7.21 (18 Dec 2004)
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/abcm2ps-3.7.21-destdir.patch, -abcm2ps-2.11.3.ebuild,
+  +abcm2ps-3.7.21.ebuild, -abcm2ps-3.7.9.ebuild:
+  Version bump for security bug #74702.
 
   14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> abcm2ps-3.7.9.ebuild:
   Stable amd64, sparc.
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 3722824fc8a8..3acfd53a7fa6 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -2,5 +2,7 @@ MD5 169b0b01d991b01d3bca18d7743ea12d ChangeLog 802
 MD5 1f1040838134ce4069f89dab5e60155c abcm2ps-2.11.3.ebuild 648
 MD5 0bbe920936e32d5d2df3112834ed9643 abcm2ps-3.7.9.ebuild 600
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 0bbe920936e32d5d2df3112834ed9643 abcm2ps-3.7.21.ebuild 600
 MD5 1c2f6cabc061fe420fbe43bb7064cc20 files/digest-abcm2ps-2.11.3 66
 MD5 6ca749d943effc1270961e547dd8bdcc files/digest-abcm2ps-3.7.9 65
+MD5 e87cb37ec163051062c84d1e8b22abed files/digest-abcm2ps-3.7.21 66
diff --git a/media-sound/abcm2ps/abcm2ps-2.11.3.ebuild b/media-sound/abcm2ps/abcm2ps-2.11.3.ebuild
deleted file mode 100644
index 5b32ddbab5a4..000000000000
--- a/media-sound/abcm2ps/abcm2ps-2.11.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-2.11.3.ebuild,v 1.6 2004/07/14 20:46:05 agriffis Exp $
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://www.ibiblio.org/gentoo/distfiles/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86"
-DEPEND=""
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	emake \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share/ \
-		install || die
-}
diff --git a/media-sound/abcm2ps/abcm2ps-3.7.9.ebuild b/media-sound/abcm2ps/abcm2ps-3.7.21.ebuild
index 7ce5fd25e263..569c180db881 100644
--- a/media-sound/abcm2ps/abcm2ps-3.7.9.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-3.7.21.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-3.7.9.ebuild,v 1.6 2004/09/14 07:16:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-3.7.21.ebuild,v 1.1 2004/12/19 01:32:59 eradicator Exp $
 
 IUSE=""
 
-inherit gnuconfig
+inherit eutils gnuconfig
 
 DESCRIPTION="A program to convert abc files to Postscript files"
 HOMEPAGE="http://moinejf.free.fr/"
 SRC_URI="http://moinejf.free.fr/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 sparc"
+KEYWORDS="amd64 sparc x86"
+
 DEPEND=""
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	gnuconfig_update
+	epatch ${FILESDIR}/${P}-destdir.patch
 }
 
 src_install() {
-	einstall || die
+	make DESTDIR="${D}" install || die
 	dodoc README abc-draft.txt Changes INSTALL
 }
diff --git a/media-sound/abcm2ps/files/abcm2ps-3.7.21-destdir.patch b/media-sound/abcm2ps/files/abcm2ps-3.7.21-destdir.patch
new file mode 100644
index 000000000000..5bc0a8f5c59e
--- /dev/null
+++ b/media-sound/abcm2ps/files/abcm2ps-3.7.21-destdir.patch
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	2004-12-18 17:29:42.774398002 -0800
++++ Makefile.in	2004-12-18 17:30:20.027279567 -0800
+@@ -40,11 +40,11 @@
+ #	$(CC32) $(C32FLAGS) -o abcm2ps.exe $(OBJ32)
+ 
+ install: abcm2ps
+-	mkdir -p $(bindir); \
+-	mkdir -p $(datadir)/abcm2ps; \
+-	$(INSTALL_PROGRAM) abcm2ps $(bindir)
++	mkdir -p $(DESTDIR)$(bindir); \
++	mkdir -p $(DESTDIR)$(datadir)/abcm2ps; \
++	$(INSTALL_PROGRAM) abcm2ps $(DESTDIR)$(bindir)
+ 	for f in *.fmt; do \
+-		$(INSTALL_DATA) $$f $(datadir)/abcm2ps; \
++		$(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/abcm2ps; \
+ 	done
+ 
+ uninstall:
diff --git a/media-sound/abcm2ps/files/digest-abcm2ps-2.11.3 b/media-sound/abcm2ps/files/digest-abcm2ps-2.11.3
deleted file mode 100644
index 1ac28c286615..000000000000
--- a/media-sound/abcm2ps/files/digest-abcm2ps-2.11.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ebf6ac9b94b16e6443ce911bb10a4ec abcm2ps-2.11.3.tar.gz 174851
diff --git a/media-sound/abcm2ps/files/digest-abcm2ps-3.7.21 b/media-sound/abcm2ps/files/digest-abcm2ps-3.7.21
new file mode 100644
index 000000000000..9d46de3afe74
--- /dev/null
+++ b/media-sound/abcm2ps/files/digest-abcm2ps-3.7.21
@@ -0,0 +1 @@
+MD5 8bcda368edfbe17ea9c63c4102233d0a abcm2ps-3.7.21.tar.gz 195774
diff --git a/media-sound/abcm2ps/files/digest-abcm2ps-3.7.9 b/media-sound/abcm2ps/files/digest-abcm2ps-3.7.9
deleted file mode 100644
index 8362d4cb8275..000000000000
--- a/media-sound/abcm2ps/files/digest-abcm2ps-3.7.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d9d2f3d9d619417a0e79f016d9ba71db abcm2ps-3.7.9.tar.gz 194337