Version bump.

(Portage version: 2.1.3.4)

6 files changed, 31 insertions, 122 deletions

diff --git a/media-sound/mikmod/ChangeLog b/media-sound/mikmod/ChangeLog
index 4193f332600b..1730e526d54a 100644
--- a/media-sound/mikmod/ChangeLog
+++ b/media-sound/mikmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mikmod
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mikmod/ChangeLog,v 1.14 2007/02/03 19:43:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mikmod/ChangeLog,v 1.15 2007/08/12 16:06:58 drac Exp $
+
+*mikmod-3.2.2_beta1 (12 Aug 2007)
+
+  12 Aug 2007; Samuli Suominen <drac@gentoo.org> +mikmod-3.2.2_beta1.ebuild:
+  Version bump.
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/media-sound/mikmod/files/digest-mikmod-3.1.6a b/media-sound/mikmod/files/digest-mikmod-3.1.6a
deleted file mode 100644
index c4e633195126..000000000000
--- a/media-sound/mikmod/files/digest-mikmod-3.1.6a
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 71d8142ae3ae27034535913e906b1384 mikmod-3.1.6.tar.gz 134827
-RMD160 e6cc140b1961bacea8e6ecbff934b9251b96156f mikmod-3.1.6.tar.gz 134827
-SHA256 03298944bd2c2851ce911e678e7cb40fa248fd81997a168b41d91bab23284abf mikmod-3.1.6.tar.gz 134827
-MD5 6c30d103a7e4cf3040de73786357e041 patch-mikmod-3.1.6-a 11262
-RMD160 b172b9eed9684a895e94c92c3fb0733208e8ba77 patch-mikmod-3.1.6-a 11262
-SHA256 1c019067225accfa2a2140a8e231b104e781fa175b84b8ad7dee66795dcc67a6 patch-mikmod-3.1.6-a 11262
diff --git a/media-sound/mikmod/files/digest-mikmod-3.2.2_beta1 b/media-sound/mikmod/files/digest-mikmod-3.2.2_beta1
new file mode 100644
index 000000000000..4c31acaaa6ce
--- /dev/null
+++ b/media-sound/mikmod/files/digest-mikmod-3.2.2_beta1
@@ -0,0 +1,3 @@
+MD5 9a9534a054afe8d28cc784041e6d1519 mikmod-3.2.2_beta1.tar.gz 285630
+RMD160 cde5945d1505cdc70acdbc1a43f670c5900ce0d1 mikmod-3.2.2_beta1.tar.gz 285630
+SHA256 617ff258da6f755f13cf8213ad8775e73193d5ec6d4cbe41836ceccd8ab65bfe mikmod-3.2.2_beta1.tar.gz 285630
diff --git a/media-sound/mikmod/files/mikmod-3.1.6-security.patch b/media-sound/mikmod/files/mikmod-3.1.6-security.patch
deleted file mode 100644
index 8e02f8e89f5c..000000000000
--- a/media-sound/mikmod/files/mikmod-3.1.6-security.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Ndur mikmod-3.1.6.orig/src/marchive.c mikmod-3.1.6/src/marchive.c
---- mikmod-3.1.6.orig/src/marchive.c	2003-06-02 18:35:38.000000000 +0200
-+++ mikmod-3.1.6/src/marchive.c	2003-06-03 14:24:57.000000000 +0200
-@@ -269,6 +269,10 @@
- {
- 	int t;
- 
-+	/* a filename may not start with '-' since this could be abused to
-+	   feed another option to the archiver */
-+	if (filename[0]=='-')
-+		return 0;
- 	for (t=0;modulepatterns[t];t++)
- 		if (!fnmatch(modulepatterns[t],filename,FNM_NOESCAPE))
- 			return 1;
-@@ -522,8 +526,8 @@
- 
- 			if (!pipe(fd)) {
- 				pid_t pid;
--				int status,cur,finished=0;
--				char ch;
-+				FILE *file;
-+				int status,s;
- 
- 				switch (pid=fork()) {
- 					case -1: /* fork failed */
-@@ -553,40 +557,22 @@
- 					}
- 						break;
- 					default: /* fork succeeded, main process code */
--						/* have to wait for the child to ensure the command was
--						   successful and the pipe contains useful
--						   information */
- 
--						/* read from the pipe */
- 						close(fd[1]);
--						cur=0;
--						for (;;) {
--							/* check if child process has finished */
--							if ((!finished)&&(waitpid(pid,&status,WNOHANG))) {
--								finished=1;
--								/* abnormal exit */
--								if (!WIFEXITED(status)) {
--								  close(fd[0]);
--								  break;
--								}
--							}
--
--							/* check for end of pipe, otherwise read char */
--							if ((!read(fd[0],&ch,1))&&(finished)) break;
--
--							if (ch=='\n') ch=0;
--							string[cur++]=ch;
--							if (!ch) {
--								cur=0;
--								if (!MA_archiver[archive].nameoffset) {
--									for (t=0;string[t]!=' ';t++);
--									string[t]=0;
--								}
--								if (MA_isModuleFilename2(string+MA_archiver[archive].nameoffset))
--									PL_Add(pl,(string+MA_archiver[archive].nameoffset),filename,0,0);
--							}
-+						if (!(file=fdopen(fd[0],"r"))) {
-+							close(fd[1]);
-+							waitpid(pid,&status,0);
-+							break;
- 						}
--						close(fd[0]);
-+						/* read from the pipe */
-+						while (fgets(string,PATH_MAX+MAXCOLUMN+1,file)) {
-+							s=strlen(string)-1;
-+							if (string[s]=='\n') string[s]='\0';
-+							if (MA_isModuleFilename2(string+MA_archiver[archive].nameoffset))
-+								PL_Add(pl,(string+MA_archiver[archive].nameoffset),filename,0,0);
-+						}
-+						fclose(file);
-+						waitpid(pid,&status,0);
- 						break;
- 				}
- 			}
diff --git a/media-sound/mikmod/mikmod-3.1.6a.ebuild b/media-sound/mikmod/mikmod-3.1.6a.ebuild
deleted file mode 100644
index d3d17a8d5128..000000000000
--- a/media-sound/mikmod/mikmod-3.1.6a.ebuild
+++ /dev/null
@@ -1,36 +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/mikmod/mikmod-3.1.6a.ebuild,v 1.10 2004/06/25 00:10:28 agriffis Exp $
-
-IUSE=""
-
-inherit eutils
-
-MY_P=${PN}-${PV/a}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="MikMod is a console MOD-Player based on libmikmod"
-HOMEPAGE="http://mikmod.raphnet.net/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-	mirror://gentoo/patch-${MY_P}-a"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND=">=media-libs/libmikmod-3.1.5"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz ; cd ${S}
-	epatch ${DISTDIR}/patch-${MY_P}-a
-	epatch ${FILESDIR}/${MY_P}-security.patch
-}
-
-src_compile() {
-	econf || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-}
diff --git a/media-sound/mikmod/mikmod-3.2.2_beta1.ebuild b/media-sound/mikmod/mikmod-3.2.2_beta1.ebuild
new file mode 100644
index 000000000000..e09857e4a6e9
--- /dev/null
+++ b/media-sound/mikmod/mikmod-3.2.2_beta1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mikmod/mikmod-3.2.2_beta1.ebuild,v 1.1 2007/08/12 16:06:58 drac Exp $
+
+DESCRIPTION="MikMod is a console MOD-Player based on libmikmod"
+HOMEPAGE="http://mikmod.raphnet.net"
+SRC_URI="http://mikmod.raphnet.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libmikmod-3.1.5"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${P/_/-}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS NEWS README
+}