x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

7 files changed, 18 insertions, 13 deletions

diff --git a/media-sound/mup/ChangeLog b/media-sound/mup/ChangeLog
index aca0e3b97691..385d60680b21 100644
--- a/media-sound/mup/ChangeLog
+++ b/media-sound/mup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mup
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.35 2011/03/10 09:24:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.36 2011/03/20 20:07:55 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> mup-5.4.ebuild,
+  files/mup-5.4-Makefile.patch, mup-5.6.ebuild, files/mup-5.6-Makefile.patch,
+  mup-5.7.ebuild, files/mup-5.7-Makefile.patch:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
 *mup-5.7 (10 Mar 2011)
 
diff --git a/media-sound/mup/files/mup-5.4-Makefile.patch b/media-sound/mup/files/mup-5.4-Makefile.patch
index 99dc34f6ee61..3aff321d0719 100644
--- a/media-sound/mup/files/mup-5.4-Makefile.patch
+++ b/media-sound/mup/files/mup-5.4-Makefile.patch
@@ -360,8 +360,8 @@ diff -urN mup-5.4.orig/Makefile mup-5.4/Makefile
 +
 +mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
-+	-I/usr/include/fltk-1.1 -Imup -L$(X_LOCATION)/lib \
-+	-L/usr/lib/fltk-1.1 -lfltk -lfltk_images -lXext -lX11 -lXpm \
++	-I/usr/include/fltk-1 -Imup -L$(X_LOCATION)/lib \
++	-L/usr/lib/fltk-1 -lfltk -lfltk_images -lXext -lX11 -lXpm \
 +	-l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm
 +
 +install: all
diff --git a/media-sound/mup/files/mup-5.6-Makefile.patch b/media-sound/mup/files/mup-5.6-Makefile.patch
index 36aed70d83fb..e44ffa215efd 100644
--- a/media-sound/mup/files/mup-5.6-Makefile.patch
+++ b/media-sound/mup/files/mup-5.6-Makefile.patch
@@ -10,9 +10,9 @@ diff -urN mup-5.6.orig/Makefile mup-5.6/Makefile
 +CFLAGS = -O2 -pipe
 +CXXFLAGS = -O2 -pipe
 +X_LOCATION = /usr
-+FLTK_LIB_LOCATION = -L/usr/lib/fltk-1.1
++FLTK_LIB_LOCATION = -L/usr/lib/fltk-1
 +X_LIBS = -lXext -lX11 -lXpm
-+FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1.1
++FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1
 +JPEGLIB = jpeg
 +PNGLIB = png
 +ZLIB = z
diff --git a/media-sound/mup/files/mup-5.7-Makefile.patch b/media-sound/mup/files/mup-5.7-Makefile.patch
index 402e2f34de95..a36a0042ca24 100644
--- a/media-sound/mup/files/mup-5.7-Makefile.patch
+++ b/media-sound/mup/files/mup-5.7-Makefile.patch
@@ -264,9 +264,9 @@
 +CFLAGS = -O2 -pipe
 +CXXFLAGS = -O2 -pipe
 +X_LOCATION = /usr
-+FLTK_LIB_LOCATION = -L/usr/lib/fltk-1.1
++FLTK_LIB_LOCATION = -L/usr/lib/fltk-1
 +X_LIBS = -lXext -lX11 -lXpm
-+FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1.1
++FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1
 +JPEGLIB = jpeg
 +PNGLIB = png
 +ZLIB = z
diff --git a/media-sound/mup/mup-5.4.ebuild b/media-sound/mup/mup-5.4.ebuild
index b0028f00c75d..524d4e96ccff 100644
--- a/media-sound/mup/mup-5.4.ebuild
+++ b/media-sound/mup/mup-5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.4.ebuild,v 1.8 2011/02/28 18:07:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.4.ebuild,v 1.9 2011/03/20 20:07:56 jlec Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/fltk:1.1
+	x11-libs/fltk:1
 	x11-libs/libXpm
 	virtual/jpeg
 	media-libs/libpng"
diff --git a/media-sound/mup/mup-5.6.ebuild b/media-sound/mup/mup-5.6.ebuild
index 4106c175e5b9..b7e08a2fb089 100644
--- a/media-sound/mup/mup-5.6.ebuild
+++ b/media-sound/mup/mup-5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.6.ebuild,v 1.3 2011/03/10 09:21:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.6.ebuild,v 1.4 2011/03/20 20:07:55 jlec Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/fltk:1.1
+	x11-libs/fltk:1
 	x11-libs/libXpm
 	virtual/jpeg
 	media-libs/libpng"
diff --git a/media-sound/mup/mup-5.7.ebuild b/media-sound/mup/mup-5.7.ebuild
index 70deb0629a0d..391dc331bbed 100644
--- a/media-sound/mup/mup-5.7.ebuild
+++ b/media-sound/mup/mup-5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.7.ebuild,v 1.1 2011/03/10 09:24:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.7.ebuild,v 1.2 2011/03/20 20:07:55 jlec Exp $
 
 EAPI=4
 inherit eutils multilib toolchain-funcs
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/fltk:1.1
+	x11-libs/fltk:1
 	x11-libs/libXpm
 	virtual/jpeg
 	media-libs/libpng"