bump to 7.16.3, bug #246969 and remove old

(Portage version: 2.2_rc15/cvs/Linux 2.6.26.8 x86_64)

3 files changed, 22 insertions, 45 deletions

diff --git a/media-gfx/nip2/ChangeLog b/media-gfx/nip2/ChangeLog
index 076eb6a883a1..3d2c488d38ab 100644
--- a/media-gfx/nip2/ChangeLog
+++ b/media-gfx/nip2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/nip2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nip2/ChangeLog,v 1.11 2008/10/25 12:10:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nip2/ChangeLog,v 1.12 2008/11/22 23:28:12 maekke Exp $
+
+*nip2-7.16.3 (22 Nov 2008)
+
+  22 Nov 2008; Markus Meier <maekke@gentoo.org>
+  -files/nip2-7.14.4-configure.patch, -nip2-7.14.4.ebuild,
+  +nip2-7.16.3.ebuild:
+  bump to 7.16.3, bug #246969 and remove old
 
   25 Oct 2008; Markus Meier <maekke@gentoo.org>
   +files/nip2-7.14.4-configure.patch, nip2-7.14.4.ebuild:
diff --git a/media-gfx/nip2/files/nip2-7.14.4-configure.patch b/media-gfx/nip2/files/nip2-7.14.4-configure.patch
deleted file mode 100644
index 08498508b2ef..000000000000
--- a/media-gfx/nip2/files/nip2-7.14.4-configure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u nip2-7.14.4.orig/configure.in nip2-7.14.4/configure.in
---- nip2-7.14.4.orig/configure.in	2008-10-25 12:02:23.000000000 +0200
-+++ nip2-7.14.4/configure.in	2008-10-25 12:06:25.000000000 +0200
-@@ -222,13 +222,17 @@
- fi
- 
- # optional ... use these to update desktop after install
-+AC_ARG_ENABLE([mime-update], AS_HELP_STRING([--disable-mime-update], [ disable mime update (default: test)]))
-+
- AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
- AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
- 
- update=no
--if test "x$UPDATE_MIME_DATABASE" != "xno"; then
--  if test "x$UPDATE_DESKTOP_DATABASE" != "xno"; then
--    update=yes
-+if test "x$enable_mime_update" != "xno"; then
-+  if test "x$UPDATE_MIME_DATABASE" != "xno"; then
-+    if test "x$UPDATE_DESKTOP_DATABASE" != "xno"; then
-+      update=yes
-+    fi
-   fi
- fi
- 
diff --git a/media-gfx/nip2/nip2-7.14.4.ebuild b/media-gfx/nip2/nip2-7.16.3.ebuild
index 7c0e389923e0..386a6e2129ed 100644
--- a/media-gfx/nip2/nip2-7.14.4.ebuild
+++ b/media-gfx/nip2/nip2-7.16.3.ebuild
@@ -1,42 +1,36 @@
 # Copyright 2003-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nip2/nip2-7.14.4.ebuild,v 1.2 2008/10/25 12:10:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nip2/nip2-7.16.3.ebuild,v 1.1 2008/11/22 23:28:12 maekke Exp $
 
-inherit fdo-mime autotools
+inherit fdo-mime versionator
 
 DESCRIPTION="VIPS Image Processing Graphical User Interface"
-SRC_URI="http://www.vips.ecs.soton.ac.uk/supported/7.14/${P}.tar.gz"
+SRC_URI="http://www.vips.ecs.soton.ac.uk/supported/$(get_version_component_range 1-2)/${P}.tar.gz"
 HOMEPAGE="http://vips.sourceforge.net"
 
 SLOT="0"
 LICENSE="GPL-2"
 
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="fftw"
 
-RDEPEND=">=media-libs/vips-7.14.1
-	>=x11-libs/gtk+-2.4
-	dev-libs/libxml2
+RDEPEND="
 	>=dev-libs/glib-2
+	dev-libs/libxml2
+	>=media-libs/vips-${PV}
+	>=x11-libs/gtk+-2.4
 	fftw? ( >=sci-libs/fftw-3 )"
 
 # Flex and bison are build dependencies, but are not needed at runtime
 DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-configure.patch
-	eautoreconf
-}
+	=sys-devel/bison-2.3*
+	sys-devel/flex"
 
 src_compile() {
 	econf \
-		--disable-mime-update \
-		$(use_with fftw fftw3) || die
+		--disable-update-desktop \
+		$(use_with fftw fftw3)
 	emake || die "emake failed"
 }
 
@@ -44,7 +38,7 @@ src_install() {
 	# create these dirs to make the makefile installs these items correctly
 	dodir /usr/share/{applications,application-registry,mime-info}
 
-	insinto	/usr/share/pixmaps
+	insinto /usr/share/pixmaps
 	doins "${FILESDIR}"/nip2.png
 	insinto /usr/share/applications
 	doins "${FILESDIR}"/nip2.desktop
@@ -52,7 +46,7 @@ src_install() {
 	doins "${FILESDIR}"/nip2.xml
 
 	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog NEWS README*
+	dodoc AUTHORS ChangeLog NEWS README* || die
 }
 
 pkg_postinst() {