Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci

5 files changed, 15 insertions, 37 deletions

diff --git a/sci-mathematics/octave-forge-image/ChangeLog b/sci-mathematics/octave-forge-image/ChangeLog
index d4bb430ea..be9e67893 100644
--- a/sci-mathematics/octave-forge-image/ChangeLog
+++ b/sci-mathematics/octave-forge-image/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for sci-mathematics/octave-forge-image
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*octave-forge-image-1.0.13 (30 Jun 2010)
+
+  30 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/octave-forge-image-1.0.6-imagemagick.patch,
+  -octave-forge-image-1.0.8.ebuild, -octave-forge-image-1.0.10.ebuild,
+  +octave-forge-image-1.0.13.ebuild:
+  Bump
+
 *octave-forge-image-1.0.10 (03 Oct 2009)
 
   03 Oct 2009; Markus Dittrich <markusle@gentoo.org>
diff --git a/sci-mathematics/octave-forge-image/Manifest b/sci-mathematics/octave-forge-image/Manifest
index 603e1865f..3a774ca75 100644
--- a/sci-mathematics/octave-forge-image/Manifest
+++ b/sci-mathematics/octave-forge-image/Manifest
@@ -1,7 +1,4 @@
-AUX octave-forge-image-1.0.6-imagemagick.patch 459 RMD160 19a5e1ed959930837698d1421fb5c5ac4c546f84 SHA1 6af7eb3b414ac6beee8d5fd14d0c921ecc55cadd SHA256 363fab28b40e8e56845621e949325427091e94c61e6fcd0eb14c4e6e2a9340e2
-DIST image-1.0.10.tar.gz 207577 RMD160 3aad306325c84cfe543c7b61b60a7fea2cfa9c3c SHA1 0d8731f8f47cc18fdfb2ead8e700d3507cff79df SHA256 576ebb6588b3fc82ccddc6a6f8db38d3687dd94c7430bcce5def471cb452d276
-DIST image-1.0.8.tar.gz 205608 RMD160 11423c12e2e74aa9f0369908c60af653e432f728 SHA1 e90c9435b4bffa787dc2bdba9177340ab5a9f987 SHA256 141de14d3ac97e0acefbaa718a4d402d826ab920fe2fd3b9bd42285760fd6c6f
-EBUILD octave-forge-image-1.0.10.ebuild 534 RMD160 cf1b20819d4832034c4d3d7b6c8d345200d47c6c SHA1 a29baf6878e16726434b1b629b57ab10d25ea411 SHA256 9fb9dfd7e8bdf5642ea0cfb93fb2afd97068800c74cb1eaca3bce8226a9fdc4f
-EBUILD octave-forge-image-1.0.8.ebuild 534 RMD160 e57fb8a784a2450de9fa5a4f6d12f2d3587271a8 SHA1 84dee51f9a4918bd07d6494032537892ab6f5ba6 SHA256 bc4d5904a5175a20ac5213855430235c642e83e661ff219b34285a967378994e
-MISC ChangeLog 1315 RMD160 e5cb41a11b15f25f0ce0e2c43a3f5b32614996a5 SHA1 c2d4b4c278b03ef93e303bb0fe1580bae9a3e10a SHA256 a7f8f867c03c6d4278b1bb38d8e9ed74864a7a8f34db2f608d5eb9e5df679b0a
+DIST image-1.0.13.tar.gz 141134 RMD160 9273308d34a768b027af0be8ff9a4f5ee59f236b SHA1 658f663842c613579572619e4afd43142212da42 SHA256 d2c2f6830a2346e958b2b9e10b49a6c8c9f832267c2d5ecfeb7ce30d6639e912
+EBUILD octave-forge-image-1.0.13.ebuild 528 RMD160 e236a7348a7d8e62f6967437b4ac91f5c89394c4 SHA1 30aeea28d184b31317f11eadcf5a8c926d147d16 SHA256 c0ed11064c5ad62df0b20999cf527e2221fc550c59069cf716258fbf54131d6d
+MISC ChangeLog 1581 RMD160 d849c4a48dfcacd8271bc65ca9689931a9684689 SHA1 410544349765466cb134876e6a205945e3143d74 SHA256 5ef5afb927538cb186b30e74ea84c1400e5786981a4b3e21976a236875e46e8a
 MISC metadata.xml 169 RMD160 034a084ee31c755155956712517306aad3d81298 SHA1 8fc92d7ea9b5520d0781291e752b5ab4f278bf4c SHA256 cd9ff49ab9a91cae923683a6693ca676e0f6495822404d8dd69629881069d863
diff --git a/sci-mathematics/octave-forge-image/files/octave-forge-image-1.0.6-imagemagick.patch b/sci-mathematics/octave-forge-image/files/octave-forge-image-1.0.6-imagemagick.patch
deleted file mode 100644
index 11f8fe57b..000000000
--- a/sci-mathematics/octave-forge-image/files/octave-forge-image-1.0.6-imagemagick.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur image-1.0.6/src/Makefile image-1.0.6.new/src/Makefile
---- image-1.0.6/src/Makefile	2008-04-28 13:07:37.000000000 -0400
-+++ image-1.0.6.new/src/Makefile	2008-05-15 00:10:40.000000000 -0400
-@@ -30,6 +30,6 @@
- 	$(MKOCTFILE) $< -lpng
- 
- __magick_read__.oct: __magick_read__.cc
--	$(MKOCTFILE) $< `Magick++-config --cppflags` -lMagick++ -lMagick
-+	$(MKOCTFILE) $< `Magick++-config --cppflags` -lMagick++ 
- 
- clean: ; -$(RM) *.o octave-core core *.oct *~
diff --git a/sci-mathematics/octave-forge-image/octave-forge-image-1.0.10.ebuild b/sci-mathematics/octave-forge-image/octave-forge-image-1.0.13.ebuild
index 4e376f09c..59cc3850d 100644
--- a/sci-mathematics/octave-forge-image/octave-forge-image-1.0.10.ebuild
+++ b/sci-mathematics/octave-forge-image/octave-forge-image-1.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.2 2006/11/03 15:44:39 markusle Exp $
 
@@ -6,11 +6,11 @@ inherit octave-forge
 
 DESCRIPTION="Provides functions for reading, writing, and processing images."
 LICENSE="GPL-2"
-HOMEPAGE="http://octave.sourceforge.net/audio/index.html"
+HOMEPAGE="http://octave.sourceforge.net/image/index.html"
 SRC_URI="mirror://sourceforge/octave/${OCT_PKG}.tar.gz"
 SLOT="0"
 
 IUSE=""
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="media-gfx/imagemagick"
+DEPEND="media-libs/jpeg"
diff --git a/sci-mathematics/octave-forge-image/octave-forge-image-1.0.8.ebuild b/sci-mathematics/octave-forge-image/octave-forge-image-1.0.8.ebuild
deleted file mode 100644
index d0361e743..000000000
--- a/sci-mathematics/octave-forge-image/octave-forge-image-1.0.8.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.2 2006/11/03 15:44:39 markusle Exp $
-
-inherit octave-forge
-
-DESCRIPTION="Provides functions for reading, writing, and processing images."
-LICENSE="GPL-2"
-HOMEPAGE="http://octave.sourceforge.net/audio/index.html"
-SRC_URI="mirror://sourceforge/octave/${OCT_PKG}.tar.gz"
-SLOT="0"
-
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="media-gfx/imagemagick"