version bump wrt #405555

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 178 insertions, 9 deletions

diff --git a/media-libs/glfw/ChangeLog b/media-libs/glfw/ChangeLog
index 0d3437c929b2..8c71e767d470 100644
--- a/media-libs/glfw/ChangeLog
+++ b/media-libs/glfw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/glfw
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.14 2012/11/14 23:31:43 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.15 2012/11/19 20:48:37 hasufell Exp $
+
+*glfw-2.7.7 (19 Nov 2012)
+
+  19 Nov 2012; Julian Ospald <hasufell@gentoo.org> +glfw-2.7.7.ebuild,
+  +files/glfw-2.7.7-dyn.patch, +files/glfw-2.7.7-pkgconfig.patch:
+  version bump wrt #405555
 
   14 Nov 2012; Julian Ospald <hasufell@gentoo.org> glfw-2.6.ebuild:
   respect CFLAGS, CC, AR and whatnot wrt #442740
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index d7257fa9e42d..5726808de25c 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -3,18 +3,22 @@ Hash: SHA256
 
 AUX glfw-2.6-dyn.patch 963 SHA256 bb91028d524ea357407bc91d4b09db0568e237954109f8fa5db2973ec449fbdd SHA512 1716466639351ee89cc69c156708e7ccdabb558caf38273d666c601d4bda0f4592f458b8b3ed70b0d022f176ef422be60304ca5df8ee177eeb28c16267d02c87 WHIRLPOOL 32b0b2ce0718a47356efe5219dda8fade0f7f28d30004be7441eab82e042dcd618c2c00d5b3af22991c4d59bfa64be81da40d9423ba7a85c31326a42f4a1fe04
 AUX glfw-2.6-ldflags.patch 467 SHA256 b484dc94e838d696056d0008fb5e3d40a531a41408b3aa006d8ad955f1b5c67b SHA512 8b1b1e98c01f6d7ff4e0265bf89a431176a285e1b529392ac47327bfb18d6ff674136649b0ae4c981c9287c84ca557c0a9bc997a278aaa008d84a2a7cdc36411 WHIRLPOOL 96c15b29aa9edcbb51c0f03c6c7e55ef0411a6883904e46feb1016074da254459941e6f16a89bd57295d1e1d4b78e0f2cdc330bd3da0be68c4b18cc82874ac7d
+AUX glfw-2.7.7-dyn.patch 1021 SHA256 dc5d666357c996ace5a649fba817f943e9ec2764d7a5b0c78445060da330c868 SHA512 388ea7941dc60fa94e6527e0e6f2d4b027bfe260893b329d5cc5854336a126a4ebb7392b862f0158c08ebc88ef4737b68e2091cbd1706075c04a55e51c28bbfb WHIRLPOOL 91e71a9461b418990b0a8c0478b206157ecba15f2dd89ee715f910eece462f1711648a907d7b9803c3c1311da4343f32ae4ca597464359b659c45beed424d6ec
+AUX glfw-2.7.7-pkgconfig.patch 1144 SHA256 e080c095839dc365d1a54974ea38164d7dacb7371277674619ab102086f67422 SHA512 3083e333e45ffd1cb427be63f37cf896ec629b24904400ba63333f1ab3f9e7664b1c63f60a7b547867bb9f4924e17754851089bffd2de4af00d9eaecbe27883f WHIRLPOOL 171927efed27b78b5293020af843b22484b4fc19b392017dc2bee67a9004336f6eb6ab4408bfaf53ec071057e86b70ae77d3a28d8dda0bb570d57d5b56c85746
 DIST glfw-2.6.tar.bz2 886843 SHA256 1b86ca8c5678fbf6999a0bfbe50de121f8aec9c07bf2383306819caebe3edfca SHA512 4161b6f447c245f982f779da9ca790a91f4bebbffbe4ea024220d856311ebf8d5755ce4481b8667bcb964ea58ce689019ee09c004f69f81df53ee834e6792163 WHIRLPOOL 24ada131512368a7e3f696b2accd3b1ee0df0948eb977df2de3ba932d7c1378d951b2aa9d48d7e8d4c1497c0ee5a8617e79904952ac6d7ca547af69ec4117dcd
+DIST glfw-2.7.7.tar.bz2 927805 SHA256 422e755979524a1da28e4addcae723b7132998ca15e89be41bf34964d9360aa2 SHA512 1b51b9d88c8eed9da8084421949b561a4779410a6369ffdf482c2d8a166bab8c58bbb087ef6f32180d3fe9430988549be5c183b338dd0e1191b2c4b4a7b55379 WHIRLPOOL 646d38fd3ea88e8aa19dcbfa8f8b933adc530ea946cd51c3e03971ed6cdb294dadf5020a876ba298c378896179a4a7ba0129b858fc7f1273a574fe1c2c388a77
 EBUILD glfw-2.6.ebuild 2225 SHA256 2d29b729d97eecd17b39cbfb13bf1b63678eb5334ac62c93db694c4583e0ca11 SHA512 8f6737ec219eebecefb57b2568d1e45115e88b0533582d7c3276c745c08465545f772f4f4bd7b29e7c886d967aeb5635f4d55ba7eb7756e90ea6bbc3295f69c1 WHIRLPOOL 095d656685dd4b574c30ae0793641e1c820652f1e285dd8baf0be8581dab0eca1ada4ba6698eaae101756632f21970a181ae24643f74b42ec90a0c77a8f910ca
-MISC ChangeLog 2052 SHA256 ee0a7f8a02434817d95a6426ac987ee6816af785f6936fb76be8411bcaf36ffe SHA512 e44037f957a69d842354482705bdec38333140974bc58b91d0e3fd7132b62c3145ad0defb1ed3919df6f7263e8db38f0dd7b6412a672c4f3c0c0bbd076be32ba WHIRLPOOL 45f962a9e446130fba97b82f563c01f2eef5d752dab5bb75971098661ecef3af7c4ab4b309814bce9117d7850dcc46f8af32075484e809e0e1689e62be423b71
+EBUILD glfw-2.7.7.ebuild 2280 SHA256 9e6d97f61e249d06583fd16d0adc5ba3c7c8d6ea86995548dd6d3f9d9af11c09 SHA512 d127bf2ea48fcf4af740bf96d7a340b98b57dff6bbd35ee279dc0fb1e99984a333b124f2bf54dc30bdb09dd2bf62f1d81f995c96afa863b6752858f9ab981686 WHIRLPOOL 310139e9954b2232283f00b833b244ebd99dce035ba905760d06cc2c5f8622063eccb531dc085534cc14793e34fdf9c5eea1129abd43349b3cb15f8c478a33f8
+MISC ChangeLog 2244 SHA256 fedf7f5254c8e4cf52ad23e7530d2198f76d5c5dcdf628b5ed7a6e033d1da4c1 SHA512 2350512752aead30729fc4a1c8dea1a401190477e69f9eac8014c86b41ca2eeebe7955893d60a981e36075047e9516fcdae26b3374ada69bfb80619db198bdb9 WHIRLPOOL 2b7db3d77896ee130163a69c5a57d4271759799020da202ff2038f93e9085deba18767820176d58f4ccb5f4c5d5fc051dcf4a74cdfb0531701a52bc33fa7b9e3
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQpCnhAAoJEFpvPKfnPDWzalsH/jwrOhxKjZUEdlrq9QhNZ4cv
-HogGcrfL4QvSaYDE5jH4IRX870lgycu4ZBpdN3Akjn9tcRg+HUWHDJwp0hUEbB+V
-YxLzvBHOwuKP74GLjucKEY9cra0Aepj9yZa8JOeQXcZU6hz4RiOGpQxr3/F5MwTe
-cDYs1qJpmcs+hKbghT+p2GsIE+pdhSTLEAGVXHDONZN80LqoW1wCtX6Pdxe3c3b/
-QQWMArBHcs4kZGCKLgy5TCujmkp/Gqq1bLB6CwKs5dRV+9yzZ9xhc6nlBvSi3j1T
-MMwIwk19Ept9+YQHq7Otjmi0NgXSpb1Q7biuyKTefkjZ15JV7heon1qb0k6JJWI=
-=o/oA
+iQEcBAEBCAAGBQJQqpspAAoJEFpvPKfnPDWzXy8H/jvSnVt0QJjvc62qnm/iK74N
+Ep0mLvcn5pWptyQm7DMg9DN1Y0VSJUWfrKe+vugkweKmstvlCpUBcWVNet9icToT
+FrznYjqLdCVL0LySJyDPrp4o/BygSCLg/wlV0V+zSGzcpAY76LnAziWpdZ/Prz/1
+qDSBVIam7Lc0Jx5sibXqfUloT9L32CgfpjOgkyrfPApN0Sjo01x0A3AjSrjEHhFZ
+XPE7RK3bCCcJv5x8g8E5BbHV6B8FV1DiLBCgVaRloCAJiRICCaka/pfhZtRFodDG
+JJYKKIWyeMKwxu9D0JeUG5J0AbeSj3zRK6LmhyTsE+yNWj2sF7tKLrn7Lg6ANKA=
+=wGE3
 -----END PGP SIGNATURE-----
diff --git a/media-libs/glfw/files/glfw-2.7.7-dyn.patch b/media-libs/glfw/files/glfw-2.7.7-dyn.patch
new file mode 100644
index 000000000000..4dc4cc242ee7
--- /dev/null
+++ b/media-libs/glfw/files/glfw-2.7.7-dyn.patch
@@ -0,0 +1,31 @@
+--- lib/x11/Makefile.x11.in
++++ lib/x11/Makefile.x11.in
+@@ -8,7 +8,7 @@
+ ##########################################################################
+ # Default: Build GLFW static library
+ ##########################################################################
+-all: libglfw.a libglfw.so
++all: libglfw.a libglfw.so.2.7.7
+ 
+ 
+ ##########################################################################
+@@ -112,7 +112,7 @@
+ ##########################################################################
+ # Rule for building shared library
+ ##########################################################################
+-libglfw.so: $(SHARED_OBJS)
++libglfw.so.2.7.7: $(SHARED_OBJS)
+ 	$(CC) $(SOFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS)
+ 
+ 
+--- compile.sh
++++ compile.sh
+@@ -88,7 +88,7 @@
+ case "x`uname 2> /dev/null`" in
+ xLinux)
+   GLFW_LIB_CFLAGS="$GLFW_LIB_CFLAGS -D_GLFW_USE_LINUX_JOYSTICKS"
+-  SOFLAGS="-shared -Wl,-soname,libglfw.so"
++  SOFLAGS="-shared -Wl,-soname,libglfw.so.2.7.7"
+   echo "Linux" 1>&6
+   ;;
+ xDarwin)
diff --git a/media-libs/glfw/files/glfw-2.7.7-pkgconfig.patch b/media-libs/glfw/files/glfw-2.7.7-pkgconfig.patch
new file mode 100644
index 000000000000..e880995c1a6b
--- /dev/null
+++ b/media-libs/glfw/files/glfw-2.7.7-pkgconfig.patch
@@ -0,0 +1,37 @@
+support libsuffix, fix version
+
+--- lib/x11/Makefile.x11.in
++++ lib/x11/Makefile.x11.in
+@@ -3,6 +3,7 @@
+ # Installation prefix (default to /usr/local)
+ ##########################################################################
+ PREFIX ?= /usr/local
++LIBDIR ?= lib
+ 
+ 
+ ##########################################################################
+@@ -99,7 +100,7 @@
+ # Rule for building libglfw.pc
+ ##########################################################################
+ libglfw.pc: libglfw.pc.in
+-	$(SED) -e 's,\@PREFIX\@,$(PREFIX),' libglfw.pc.in > libglfw.pc
++	$(SED) -e 's,\@PREFIX\@,$(PREFIX),' -e 's,\@LIBDIR@,$(LIBDIR),' libglfw.pc.in > libglfw.pc
+ 
+ 
+ ##########################################################################
+--- compile.sh
++++ compile.sh
+@@ -734,11 +734,11 @@
+ prefix=@PREFIX@
+ exec_prefix=\${prefix}
+ includedir=\${prefix}/include
+-libdir=\${exec_prefix}/lib
++libdir=\${exec_prefix}/@LIBDIR@
+ 
+ Name: GLFW
+ Description: A portable framework for OpenGL development
+-Version: 2.7.4
++Version: 2.7.7
+ URL: http://www.glfw.org/
+ Requires.private: gl x11 $PKG_LIBS
+ Libs: -L\${libdir} -lglfw $LFLAGS_THREAD $LFLAGS_CLOCK
diff --git a/media-libs/glfw/glfw-2.7.7.ebuild b/media-libs/glfw/glfw-2.7.7.ebuild
new file mode 100644
index 000000000000..97548e8931b4
--- /dev/null
+++ b/media-libs/glfw/glfw-2.7.7.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.7.7.ebuild,v 1.1 2012/11/19 20:48:37 hasufell Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="The Portable OpenGL FrameWork"
+HOMEPAGE="http://glfw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXrandr
+	virtual/glu
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e "s:\"docs/:\"/usr/share/doc/${PF}/pdf/:" \
+		readme.html \
+		|| die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-{dyn,pkgconfig}.patch
+
+	# respect ldflags
+	sed -i \
+		-e "s/\$(LFLAGS)/\$(LDFLAGS) \$(LFLAGS)/" \
+		{lib/x11,examples}/Makefile.x11.in || die "sed Makefile.x11.in failed"
+
+	# respect cflags in linking command
+	# build system is messing up CFLAGS variable, so sed is the easy way to go
+	sed -i \
+		-e "/^libglfw.so/{n;s/\$(CC)/\$(CC) ${CFLAGS}/;}" \
+		lib/x11/Makefile.x11.in \
+		|| die "sed Makefile.x11.in failed"
+}
+
+src_configure() {
+	sh ./compile.sh
+}
+
+src_compile() {
+	emake -C lib/x11 AR=$(tc-getAR) CC=$(tc-getCC) PREFIX=/usr LIBDIR=$(get_libdir) -f Makefile.x11 all libglfw.pc
+	use examples && emake -C examples CC=$(tc-getCC) -f Makefile.x11 all
+}
+
+src_install() {
+	dolib.a lib/x11/libglfw.a
+	dolib.so lib/x11/libglfw.so.2.7.7
+	dosym libglfw.so.2.7.7 /usr/$(get_libdir)/libglfw.so
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins lib/x11/libglfw.pc
+	doheader -r include/GL
+	dohtml -r readme.html
+	insinto /usr/share/doc/${PF}/pdf
+	doins docs/*.pdf
+	dodoc docs/readme.txt
+
+	if use examples; then
+		local f
+		local MY_EXAMPLES="boing gears listmodes mipmaps
+			mtbench mthello particles pong3d splitview
+			triangle wave"
+		local MY_PICS="mipmaps.tga pong3d_field.tga pong3d_instr.tga
+			pong3d_menu.tga pong3d_title.tga
+			pong3d_winner1.tga pong3d_winner2.tga"
+
+		docompress -x /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}/examples
+
+		doins examples/Makefile.x11
+		for f in $MY_EXAMPLES; do
+			doins examples/${f}.c
+		done
+		for f in $MY_PICS; do
+			doins examples/${f}
+		done
+
+		insopts -m0755
+		for f in $MY_EXAMPLES; do
+			doins examples/${f}
+		done
+	fi
+}