adding as a dependency for new package meshlab, lib3ds should be slotted in future per upstream/redhat discussion https://bugzilla.redhat.com/show_bug.cgi?id=633475#c3

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x34E69781

6 files changed, 173 insertions, 3 deletions

diff --git a/media-libs/lib3ds/ChangeLog b/media-libs/lib3ds/ChangeLog
index 13a1c216d72d..4d9aaffb7185 100644
--- a/media-libs/lib3ds/ChangeLog
+++ b/media-libs/lib3ds/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/lib3ds
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lib3ds/ChangeLog,v 1.27 2014/03/07 15:31:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lib3ds/ChangeLog,v 1.28 2014/08/14 18:25:13 amynka Exp $
+
+*lib3ds-1.3.0-r1 (14 Aug 2014)
+
+  14 Aug 2014; Amy Winston <amynka@gentoo.org>
+  +files/lib3ds-1.3.0-r1-mesh.c.patch, +files/lib3ds-1.3.0-r1-pkgconfig.patch,
+  +lib3ds-1.3.0-r1.ebuild, metadata.xml:
+  adding as a dependency for new package meshlab, lib3ds should be slotted in
+  future per upstream/redhat discussion
+  https://bugzilla.redhat.com/show_bug.cgi?id=633475#c3
 
   07 Mar 2014; Michael Sterrett <mr_bones_@gentoo.org> -lib3ds-1.3.0.ebuild:
   old
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index 72695da2321a..ee474e3b77b2 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -1,6 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX lib3ds-1.3.0-r1-mesh.c.patch 682 SHA256 bc15f51a3ea319b1bb0e35617c9f12e9760879eaedf790a6a96e6a47ac7d60b7 SHA512 d01466d08f0ffae7f97f510842f89d7b5b171bf5534e2348ea1e7d5e6588b4bc802d9a67fe992a00d4894a4c7194a7896740aaac85b398f191384656fcbb677e WHIRLPOOL 1968c8cf96eb27d777e8205540b67ac48375b18cfe1a3301f0cdb7a2706663e943b4f7f9c640ec7525e1fe8dec191bd7dec10bd5de071e837f9e2c74f5a7c7f5
+AUX lib3ds-1.3.0-r1-pkgconfig.patch 2345 SHA256 85b15a0fce686e3c070aa2d9479fff6b544610a93e3c54ebc9ecf1f3c0ae5d95 SHA512 4f9ef4bb9a6716822a4310441f53954b02b18266b95db1d31dce8e3a46a944fde3af39ba74409939500a61387ba2f4f9c5af5b73c58ca91b1dab75d996f85394 WHIRLPOOL 664698bec3d2518389d27089478b010e3d888420eb53d5303189a787ad6da835f625fe2778b6bbc170f0adffd0934c991a14d745f7c4ba79e52da9f6a7822613
 AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 SHA256 3e25948200a8548b404394f3658225fb86c00e6803840300498472ce9089354b SHA512 63bc93b5cdf099a33b13ad84ebbd964607fe2824f102d5e4dd37c435cb84ca82e4de16a1796de8abe9e4dd43071b3bcb6b3f176d0d2c4019534d8d08decc8570 WHIRLPOOL 06dbb832c50dc114da2274a43ef60c6f502e99dde4db4b1bab18aac6d3cf4c3e9313d22c4048bd589724f7337bf84a1619aabf6aa0aceee89bf6fb8cf9b5ddaa
 AUX lib3ds-2.0.0_rc1-underlinking.patch 1584 SHA256 c633b458054ff28d02644f3e9709925a7d2358bece2590a7ad2855f248f9332e SHA512 be3a3470cba90beeac5f1bc161c6885c09483e197b5501208e338ef7256e66e1a27066f0f91403ae6abdeb311e2eb374a36e01c4e3c99a2e7b77422bf24b9799 WHIRLPOOL 1cf58cd821bacec707c44f94396b2d2aac41fd328d8d69f2257a857f41c8b3fceaa3e1f50f3fee2d2806a0b71142c69835ac1989c66c4e531647fc6e4071c555
+DIST lib3ds-1.3.0.zip 443675 SHA256 f5b00c302955a67fa5fb1f2d3f2583767cdc61fdbc6fd843c0c7c9d95c5629e3 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac WHIRLPOOL 33adf50f5afff3563dabd48844cb0ea0631a4c2ce047fc7998139b15293f7de68646465ce0956918e1e3d04ece5efdd575d172c5d4183a73bb816d3d262c3682
 DIST lib3ds-20080909.zip 427233 SHA256 5d4df5f86a17a1aba58e9f54fe6a43c825bab15d8439ac9416c3f0c30fd1cca2 SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87 WHIRLPOOL fd9c19a3fe6341cbf970d2c75352cb317c8073b23e94b792c4e905aa0a79e7c31d7ca1dd35dbef11f891052438c9216faee8245470423d5d8e206ea4981a9aa5
+EBUILD lib3ds-1.3.0-r1.ebuild 686 SHA256 f13ad78c3c251904a43933dde1953235f7b849c5e5d5e437e81f59ba1fed946e SHA512 f49827ee008a95d35614bbd3e4afab3247e5976b1d478b1cd4ce8a1d59f2110dff38346b858d4b771534b30931dddada8bbc20aae719931e77436cffa9797283 WHIRLPOOL 7e3dba93d40ea8ff49d670c1af009971029213c0e8aa84c9dcf0deb9f5f82ce2d30b038e551a8cdc9d4a16079439b154f98b3bb970257f32397b016aba0aa665
 EBUILD lib3ds-2.0.0_rc1.ebuild 842 SHA256 1620c3e0e510868a2568f3bc18fb9ad0bd4ac33d3a9e54d62a70b090d8e1e8e5 SHA512 81a2ba40f826c7b7f08b21b7c236fdf18874a2570821993b984e0ef34536738241a36b7548e171a296d8522e9809d1a41447bfec727620a528bef82bcc6dc0da WHIRLPOOL 3d9140980ff9db78803cd323f3d5814f96f14f318d53f80c960ec8c7689b5037693d13b33133eab5bdce266b921ff5dc8124f63d76d08e18fa7486bc874bc1bf
-MISC ChangeLog 3225 SHA256 8eed908c6b895c34b7a608fd0960147e5fc35b57a2c14dbba740251a6b2dff86 SHA512 0c353cbb1f487e71159de5a89fc1ab183b70b2d17f261b1025d445c32c7de76007cf998aa4380cd3e75d83851953524c9c7619ceb9c3d266a98fdb1442f653f9 WHIRLPOOL c3593cfbdb28ae721d09c6d55019ec44771751cb6c29568ec083283aff4b38053345bb9878c61191889bbf64f7a71a4992f1ae7e658af720492fcd6b9b9a4db6
-MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+MISC ChangeLog 3596 SHA256 3a59f0be71037d1f176c649606a8707e2d82970199dbebe856cd0e202b06a327 SHA512 e7acba4d052b6a4c563e56976fa6fa1b4430aebe617d4f77456b64c37756c0c8c99e963cd7e62e5000de4bfe9743609a2eb3388402b43a255dcd964f3942c61a WHIRLPOOL c42e8b919d9ddf5b7c073ce2c19347651a2b3a1e87484cf2da002b17848f6d83965f15d7336c735e163af45e53bc736c1becc0bcbeec9ba59f8e8b07a48bc789
+MISC metadata.xml 368 SHA256 bb40674c78fedfe4acd6de977498d686c1fdcfcac840ec170278d09a809a3436 SHA512 7ff33cf1fe43388568a244c973e425ff2b549aee9f70f8e9fed1a6b8fbff3cb640d8ee8a1ab3dbd84587a74d15af4328ebaa86a1ec96e765f138bf33e45de96a WHIRLPOOL 8954ad946bfa74130ff4b5e74cd8f112190c430d520b0b99ec5cc5afd50ce31a765f7b055e909a74a1b5bc86b98a85d2ff1eb0703bb5a7a24984cda8a0fdeb6b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJT7P8KAAoJEDuJ1FA05peBr3kH/Rm9cIVqi58041tro2XqywbU
+3EAAQ2/yFGULx5S+SINpjDrtE/N+RFfg2gE1ow/jue8cDBambZlQFe4BupDXbert
+7vAvxS8McPKG5ZmM0z5Sfp+9QfxMuWpffeaT/cbJncvQLDdY2iGzI3xUvfzMBHpd
+oyIHPHr//KKJ8INUxZkcuexTmt9DGbNI39BGrp7OuZfeODGsl4IPNIcdhXvz/57a
+RZhZ2K6lDc0g2lI5VjY8tjBGWQ2meb2Yh2FXD6TNOwHPowOCwryQwiUoaX2Qllca
+7SqnjAYV7VUUu3jMBOvowy3bUurv9Gg6TBAqSGD0mZsBfw5Ya3Ch8Sg5VWiNg10=
+=M/4M
+-----END PGP SIGNATURE-----
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch
new file mode 100644
index 000000000000..1455660596bf
--- /dev/null
+++ b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch
@@ -0,0 +1,17 @@
+diff -Naur lib3ds-1.3.0.orig/lib3ds/mesh.c lib3ds-1.3.0/lib3ds/mesh.c
+--- lib3ds-1.3.0.orig/lib3ds/mesh.c	2007-06-20 19:04:08.000000000 +0200
++++ lib3ds-1.3.0/lib3ds/mesh.c	2010-09-14 06:34:39.987807911 +0200
+@@ -87,8 +87,11 @@
+             faces=lib3ds_io_read_word(io);
+             for (i=0; i<faces; ++i) {
+               index=lib3ds_io_read_word(io);
+-              ASSERT(index<mesh->faces);
+-              strcpy(mesh->faceL[index].material, name);
++              if (index<mesh->faces) {
++                strncpy(mesh->faceL[index].material, name, 64);
++              } else {
++                // TODO warning
++              }
+             }
+           }
+           break;
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch
new file mode 100644
index 000000000000..41f658e5311b
--- /dev/null
+++ b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch
@@ -0,0 +1,94 @@
+diff -uNr lib3ds-1.2.0.orig/lib3ds-config.in lib3ds-1.2.0/lib3ds-config.in
+--- lib3ds-1.2.0.orig/lib3ds-config.in	2000-05-23 14:13:08.000000000 +0200
++++ lib3ds-1.2.0/lib3ds-config.in	2007-10-21 06:37:48.000000000 +0200
+@@ -1,9 +1,5 @@
+ #!/bin/sh
+ 
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-exec_prefix_set=no
+-
+ usage()
+ {
+     cat <<EOF
+@@ -22,6 +18,8 @@
+ 	usage 1 1>&2
+ fi
+ 
++PKG_CONFIG_ARGS=
++
+ while test $# -gt 0; do
+   case "$1" in
+   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+@@ -30,23 +28,23 @@
+ 
+   case $1 in
+     --prefix=*)
+-      prefix=$optarg
++      PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=prefix=$optarg"
+       if test $exec_prefix_set = no ; then
+-        exec_prefix=$optarg
++        PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg"
+       fi
+       ;;
+     --prefix)
+       echo_prefix=yes
+       ;;
+     --exec-prefix=*)
+-      exec_prefix=$optarg
++      PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg"
+       exec_prefix_set=yes
+       ;;
+     --exec-prefix)
+       echo_exec_prefix=yes
+       ;;
+     --version)
+-      echo @LIB3DS_VERSION@
++      pkg-config --modversion lib3ds
+       ;;
+     --cflags)
+       echo_cflags=yes
+@@ -62,23 +60,18 @@
+ done
+ 
+ if test "$echo_prefix" = "yes"; then
+-	echo $prefix
++  pkg-config $PKG_CONFIG_ARGS --variable=prefix lib3ds
+ fi
+ 
+ if test "$echo_exec_prefix" = "yes"; then
+-	echo $exec_prefix
++  pkg-config $PKG_CONFIG_ARGS --variable=exec_prefix lib3ds
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      if test @includedir@ != /usr/include ; then
+-            echo -I@includedir@
+-      fi
++  pkg-config $PKG_CONFIG_ARGS --cflags lib3ds
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      if test @libdir@ != /usr/lib ; then
+-            my_linker_flags="-L@libdir@"
+-      fi
+-      echo ${my_linker_flags} -l3ds
+-fi      
++  pkg-config $PKG_CONFIG_ARGS --libs lib3ds
++fi
+ 
+diff -uNr lib3ds-1.2.0.orig/lib3ds.pc.in lib3ds-1.2.0/lib3ds.pc.in
+--- lib3ds-1.2.0.orig/lib3ds.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ lib3ds-1.2.0/lib3ds.pc.in	2007-10-21 06:23:53.000000000 +0200
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: lib3ds
++Description: lib3ds
++Version: @VERSION@
++Requires:
++Libs: -L${libdir} -l3ds -lm
++Cflags: -I${includedir}
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..35bd995f4e1d
--- /dev/null
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild,v 1.1 2014/08/14 18:25:13 amynka Exp $
+
+EAPI="5"
+
+inherit autotools-utils
+
+DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
+HOMEPAGE="https://code.google.com/p/lib3ds/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="media-libs/freeglut
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+PATCHES=(
+	"${FILESDIR}/lib3ds-1.3.0-r1-pkgconfig.patch"
+	"${FILESDIR}/lib3ds-1.3.0-r1-mesh.c.patch"
+)
diff --git a/media-libs/lib3ds/metadata.xml b/media-libs/lib3ds/metadata.xml
index d3c2cc926f0b..6dd50faab98c 100644
--- a/media-libs/lib3ds/metadata.xml
+++ b/media-libs/lib3ds/metadata.xml
@@ -2,4 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
+<herd>3dprint</herd>
+<maintainer>
+	<email>amynka@gentoo.org</email>
+</maintainer>
+<longdescription>
+lib3ds is an overall software library for managing 3D-Studio Release 3 and 4 ".3DS" files.
+</longdescription>
 </pkgmetadata>