[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2020-11-17 Thread Agostino Sarubbo
commit: fe4302e736faf9d4af7d8d4c82b39230a159e84b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 18 06:50:07 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 18 06:50:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe4302e7

media-gfx/wings: amd64 stable wrt bug #681526

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/wings/wings-2.2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/wings/wings-2.2.6.1.ebuild 
b/media-gfx/wings/wings-2.2.6.1.ebuild
index 27d7649bc56..e27096cf47f 100644
--- a/media-gfx/wings/wings-2.2.6.1.ebuild
+++ b/media-gfx/wings/wings-2.2.6.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
>dev-lang/erlang-21[wxwidgets]



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2020-10-25 Thread Thomas Deutschmann
commit: 4a175d072a59dd030ea29e07ca813e42999d9b95
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Oct 25 23:01:29 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Oct 25 23:01:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a175d07

media-gfx/wings: x86 stable (bug #681526)

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/wings/wings-2.2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/wings/wings-2.2.6.1.ebuild 
b/media-gfx/wings/wings-2.2.6.1.ebuild
index d030dc78202..27d7649bc56 100644
--- a/media-gfx/wings/wings-2.2.6.1.ebuild
+++ b/media-gfx/wings/wings-2.2.6.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
>dev-lang/erlang-21[wxwidgets]



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2020-10-10 Thread Jeroen Roovers
commit: c2570a1964197ee65489c98b265390f25d492ecf
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Oct 10 11:24:44 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Oct 10 11:25:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2570a19

media-gfx/wings: Set CC, fix CFLAGS

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Closes: https://bugs.gentoo.org/show_bug.cgi?id=747481
Signed-off-by: Jeroen Roovers  gentoo.org>

 media-gfx/wings/wings-2.2.6.1.ebuild | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/media-gfx/wings/wings-2.2.6.1.ebuild 
b/media-gfx/wings/wings-2.2.6.1.ebuild
index b6561579ab6..d030dc78202 100644
--- a/media-gfx/wings/wings-2.2.6.1.ebuild
+++ b/media-gfx/wings/wings-2.2.6.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="Wings 3D is an advanced subdivision modeler"
 HOMEPAGE="http://www.wings3d.com/;
@@ -22,8 +23,14 @@ DEPEND="
${RDEPEND}
 "
 
+src_prepare() {
+   sed -i -e 's# -Werror##g;s# -O3##g' $(find -name Makefile) || die
+   default
+}
+
 src_compile() {
export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+   tc-export CC
# Work around parallel make issues
# Set ER_LIBS to the top source directory
emake vsn.mk



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2020-10-09 Thread Sergei Trofimovich
commit: e1333293c896b09dff3d08b2dd0fead9698797fa
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Oct  9 22:52:58 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Oct  9 22:52:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1333293

media-gfx/wings: drop deleted  gentoo.org>

 media-gfx/wings/wings-2.1.5.ebuild   | 7 ++-
 media-gfx/wings/wings-2.1.6.ebuild   | 7 ++-
 media-gfx/wings/wings-2.1.7.ebuild   | 7 ++-
 media-gfx/wings/wings-2.2.5.ebuild   | 7 ++-
 media-gfx/wings/wings-2.2.6.1.ebuild | 5 +
 5 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/media-gfx/wings/wings-2.1.5.ebuild 
b/media-gfx/wings/wings-2.1.5.ebuild
index 04bf89ee219..be3e01a0d82 100644
--- a/media-gfx/wings/wings-2.1.5.ebuild
+++ b/media-gfx/wings/wings-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-   || (
-   dev-lang/erlang-21[wxwidgets]
-   )
+   >dev-lang/erlang-21[wxwidgets]
dev-libs/cl
media-libs/glu
media-libs/libsdl[opengl]

diff --git a/media-gfx/wings/wings-2.1.6.ebuild 
b/media-gfx/wings/wings-2.1.6.ebuild
index 3772405f629..9f5e9713d19 100644
--- a/media-gfx/wings/wings-2.1.6.ebuild
+++ b/media-gfx/wings/wings-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-   || (
-   dev-lang/erlang-21[wxwidgets]
-   )
+   >dev-lang/erlang-21[wxwidgets]
dev-libs/cl
media-libs/glu
media-libs/libsdl[opengl]

diff --git a/media-gfx/wings/wings-2.1.7.ebuild 
b/media-gfx/wings/wings-2.1.7.ebuild
index 3772405f629..9f5e9713d19 100644
--- a/media-gfx/wings/wings-2.1.7.ebuild
+++ b/media-gfx/wings/wings-2.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-   || (
-   dev-lang/erlang-21[wxwidgets]
-   )
+   >dev-lang/erlang-21[wxwidgets]
dev-libs/cl
media-libs/glu
media-libs/libsdl[opengl]

diff --git a/media-gfx/wings/wings-2.2.5.ebuild 
b/media-gfx/wings/wings-2.2.5.ebuild
index 8ae2e6a7556..b6561579ab6 100644
--- a/media-gfx/wings/wings-2.2.5.ebuild
+++ b/media-gfx/wings/wings-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-   || (
-   dev-lang/erlang-21[wxwidgets]
-   )
+   >dev-lang/erlang-21[wxwidgets]
dev-libs/cl
media-libs/glu
media-libs/libsdl[opengl]

diff --git a/media-gfx/wings/wings-2.2.6.1.ebuild 
b/media-gfx/wings/wings-2.2.6.1.ebuild
index 81caee71f2e..b6561579ab6 100644
--- a/media-gfx/wings/wings-2.2.6.1.ebuild
+++ b/media-gfx/wings/wings-2.2.6.1.ebuild
@@ -12,10 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-   || (
-   dev-lang/erlang-21[wxwidgets]
-   )
+   >dev-lang/erlang-21[wxwidgets]
dev-libs/cl
media-libs/glu
media-libs/libsdl[opengl]



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2020-05-17 Thread Jeroen Roovers
commit: 5f674bbab87e63a33c22ae2c591aed3b8ee9492b
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun May 17 08:56:20 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun May 17 08:58:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f674bba

media-gfx/wings: Version 2.2.6.1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 media-gfx/wings/Manifest |  1 +
 media-gfx/wings/wings-2.2.6.1.ebuild | 50 
 2 files changed, 51 insertions(+)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index c8d3685ab39..9baf9304dcb 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -2,3 +2,4 @@ DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 
10b14e8dd29daf74fd6af9229341296fa457df4
 DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 
9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244
 SHA512 
db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7
 DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B 
b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235
 SHA512 
6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10
 DIST wings-2.2.5.tar.bz2 3211359 BLAKE2B 
d5aa7ea337894f18d6b45ff7e68bb35d587da47bf173045d80eb643d748fc64a511db305d1dc164789b06aa34ea47549a04a05564fa615bf01532da294768cd3
 SHA512 
343fd601a68cccff0151748f151c85635bf57acc01c25fd2ba770f255d65e73a49671c3a84c4433576c1ba3f9e98a2d098a47e3674d4617a07817973bee0136a
+DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B 
a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208
 SHA512 
dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4

diff --git a/media-gfx/wings/wings-2.2.6.1.ebuild 
b/media-gfx/wings/wings-2.2.6.1.ebuild
new file mode 100644
index 000..81caee71f2e
--- /dev/null
+++ b/media-gfx/wings/wings-2.2.6.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/;
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   || (
+   dev-lang/erlang-21[wxwidgets]
+   )
+   dev-libs/cl
+   media-libs/glu
+   media-libs/libsdl[opengl]
+   virtual/opengl
+"
+DEPEND="
+   ${RDEPEND}
+"
+
+src_compile() {
+   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+   # Work around parallel make issues
+   # Set ER_LIBS to the top source directory
+   emake vsn.mk
+   for subdir in intl_tools e3d src plugins_src icons; do
+   emake -C ${subdir} opt ERL_LIBS="${S}"
+   done
+   default
+}
+
+src_install() {
+   WINGS_PATH=${ERL_PATH}/${P}
+   dodir ${WINGS_PATH}
+
+   find -name 'Makefile*' -exec rm -f '{}' \;
+
+   insinto ${WINGS_PATH}
+   doins -r e3d ebin icons plugins priv psd shaders src textures tools
+
+   newbin "${FILESDIR}"/wings.sh-r1 wings
+   dodoc AUTHORS README
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2019-12-10 Thread Jeroen Roovers
commit: c70d27d079cbd4bb0766e5a5dd61a0904788531b
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Dec 10 09:11:22 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Dec 10 09:11:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c70d27d0

media-gfx/wings: Version 2.2.5

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Closes: https://bugs.gentoo.org/684118
Signed-off-by: Jeroen Roovers  gentoo.org>

 media-gfx/wings/Manifest   |  1 +
 media-gfx/wings/wings-2.2.5.ebuild | 50 ++
 2 files changed, 51 insertions(+)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index c69a2dccec9..c8d3685ab39 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,3 +1,4 @@
 DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 
10b14e8dd29daf74fd6af9229341296fa457df405542274533df85198d932188c53094afffbc4b09342c29086df02a7e19d4983f1fc912623ea79ae85e9d4067
 SHA512 
37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
 DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 
9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244
 SHA512 
db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7
 DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B 
b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235
 SHA512 
6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10
+DIST wings-2.2.5.tar.bz2 3211359 BLAKE2B 
d5aa7ea337894f18d6b45ff7e68bb35d587da47bf173045d80eb643d748fc64a511db305d1dc164789b06aa34ea47549a04a05564fa615bf01532da294768cd3
 SHA512 
343fd601a68cccff0151748f151c85635bf57acc01c25fd2ba770f255d65e73a49671c3a84c4433576c1ba3f9e98a2d098a47e3674d4617a07817973bee0136a

diff --git a/media-gfx/wings/wings-2.2.5.ebuild 
b/media-gfx/wings/wings-2.2.5.ebuild
new file mode 100644
index 000..8ae2e6a7556
--- /dev/null
+++ b/media-gfx/wings/wings-2.2.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/;
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   || (
+   dev-lang/erlang-21[wxwidgets]
+   )
+   dev-libs/cl
+   media-libs/glu
+   media-libs/libsdl[opengl]
+   virtual/opengl
+"
+DEPEND="
+   ${RDEPEND}
+"
+
+src_compile() {
+   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+   # Work around parallel make issues
+   # Set ER_LIBS to the top source directory
+   emake vsn.mk
+   for subdir in intl_tools e3d src plugins_src icons; do
+   emake -C ${subdir} opt ERL_LIBS="${S}"
+   done
+   default
+}
+
+src_install() {
+   WINGS_PATH=${ERL_PATH}/${P}
+   dodir ${WINGS_PATH}
+
+   find -name 'Makefile*' -exec rm -f '{}' \;
+
+   insinto ${WINGS_PATH}
+   doins -r e3d ebin icons plugins priv psd shaders src textures tools
+
+   newbin "${FILESDIR}"/wings.sh-r1 wings
+   dodoc AUTHORS README
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2018-10-22 Thread Jeroen Roovers
commit: 426081403e396a3df5ca3446605bc18ba9f2cdb0
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Oct 22 10:36:53 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Oct 22 10:38:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42608140

media-gfx/wings: Fix dev-lang/erlang[smp!?] dependency.

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Jeroen Roovers  gentoo.org>

 media-gfx/wings/wings-2.1.5.ebuild | 7 +--
 media-gfx/wings/wings-2.1.6.ebuild | 7 +--
 media-gfx/wings/wings-2.1.7.ebuild | 7 +--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/media-gfx/wings/wings-2.1.5.ebuild 
b/media-gfx/wings/wings-2.1.5.ebuild
index e8f31fd40fc..04bf89ee219 100644
--- a/media-gfx/wings/wings-2.1.5.ebuild
+++ b/media-gfx/wings/wings-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-   >=dev-lang/erlang-18.1[smp,wxwidgets]
+   || (
+   dev-lang/erlang-21[wxwidgets]
+   )
dev-libs/cl
media-libs/glu
media-libs/libsdl[opengl]

diff --git a/media-gfx/wings/wings-2.1.6.ebuild 
b/media-gfx/wings/wings-2.1.6.ebuild
index bc645abc423..3772405f629 100644
--- a/media-gfx/wings/wings-2.1.6.ebuild
+++ b/media-gfx/wings/wings-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-   >=dev-lang/erlang-18.1[smp,wxwidgets]
+   || (
+   dev-lang/erlang-21[wxwidgets]
+   )
dev-libs/cl
media-libs/glu
media-libs/libsdl[opengl]

diff --git a/media-gfx/wings/wings-2.1.7.ebuild 
b/media-gfx/wings/wings-2.1.7.ebuild
index bc645abc423..3772405f629 100644
--- a/media-gfx/wings/wings-2.1.7.ebuild
+++ b/media-gfx/wings/wings-2.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-   >=dev-lang/erlang-18.1[smp,wxwidgets]
+   || (
+   dev-lang/erlang-21[wxwidgets]
+   )
dev-libs/cl
media-libs/glu
media-libs/libsdl[opengl]



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2018-06-03 Thread Jeroen Roovers
commit: 76250796cfa4288a57bab2316679dd69f2f75ade
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun  3 13:32:38 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun  3 13:33:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76250796

media-gfx/wings: Version 2.1.7.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-gfx/wings/Manifest   |  1 +
 media-gfx/wings/wings-2.1.7.ebuild | 63 ++
 2 files changed, 64 insertions(+)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index ae22a788cb3..c69a2dccec9 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,2 +1,3 @@
 DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 
10b14e8dd29daf74fd6af9229341296fa457df405542274533df85198d932188c53094afffbc4b09342c29086df02a7e19d4983f1fc912623ea79ae85e9d4067
 SHA512 
37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
 DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 
9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244
 SHA512 
db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7
+DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B 
b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235
 SHA512 
6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10

diff --git a/media-gfx/wings/wings-2.1.7.ebuild 
b/media-gfx/wings/wings-2.1.7.ebuild
new file mode 100644
index 000..bc645abc423
--- /dev/null
+++ b/media-gfx/wings/wings-2.1.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/;
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   >=dev-lang/erlang-18.1[smp,wxwidgets]
+   dev-libs/cl
+   media-libs/glu
+   media-libs/libsdl[opengl]
+   virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e '/include_lib/s|"wings/|"../|' \
+   $(find . -name '*'.erl) \
+   || die
+
+   sed -i \
+   -e 's|-O3||g' \
+   -e 's|-Werror||g' \
+   -e 's|CFLAGS = |CFLAGS += |g' \
+   $(find . -name Makefile) \
+   || die
+}
+
+src_configure() {
+   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+}
+
+src_compile() {
+   # Work around parallel make issues
+   emake vsn.mk
+   for subdir in intl_tools src e3d icons plugins_src; do
+   emake -C ${subdir}
+   done
+}
+
+src_install() {
+   WINGS_PATH=${ERL_PATH}/${P}
+   dodir ${WINGS_PATH}
+
+   find -name 'Makefile*' -exec rm -f '{}' \;
+
+   insinto ${WINGS_PATH}
+   doins -r e3d ebin icons plugins psd shaders src textures tools
+
+   newbin "${FILESDIR}"/wings.sh-r1 wings
+   dodoc AUTHORS README
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2018-03-18 Thread Jeroen Roovers
commit: 808ce488f9e502fb413ea1aea44f7bcda246
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Mar 18 19:40:57 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Mar 18 19:41:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=808ce488

media-gfx/wings: Old.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/wings/Manifest   |  1 -
 media-gfx/wings/wings-1.1.1.ebuild | 44 --
 2 files changed, 45 deletions(-)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 21e06722dd4..ae22a788cb3 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,3 +1,2 @@
-DIST wings-1.1.1.tar.bz2 1932572 BLAKE2B 
9899d17355983c3b9c7beea87b1a94e665f194f5e0935d992389f8ea29a511a4682b4b1953316ea41ba1d09a9a474ebf5fd757fe4bf3638ebecf9c7faf1403aa
 SHA512 
e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 
10b14e8dd29daf74fd6af9229341296fa457df405542274533df85198d932188c53094afffbc4b09342c29086df02a7e19d4983f1fc912623ea79ae85e9d4067
 SHA512 
37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
 DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 
9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244
 SHA512 
db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7

diff --git a/media-gfx/wings/wings-1.1.1.ebuild 
b/media-gfx/wings/wings-1.1.1.ebuild
deleted file mode 100644
index 3497dec8eba..000
--- a/media-gfx/wings/wings-1.1.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit multilib eutils
-
-DESCRIPTION="excellent 3D polygon mesh modeler"
-HOMEPAGE="http://www.wings3d.com/;
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/erlang-13.0
-   >=media-libs/esdl-1.0.1
-   media-libs/libsdl[opengl]"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-   ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-   ESDL_PATH="${ERL_PATH}/$(best_version media-libs/esdl | cut -d/ -f2)"
-}
-
-src_compile() {
-   make ESDL_PATH="${ERL_PATH}/$(best_version media-libs/esdl | cut -d/ 
-f2)" || die
-}
-
-src_install() {
-   WINGS_PATH=${ERL_PATH}/${P}
-   dodir ${WINGS_PATH}
-
-   find -name 'Makefile*' -exec rm -f '{}' \;
-   for subdir in e3d ebin icons plugins plugins_src src fonts ; do
-   cp -r ${subdir} "${D}"/${WINGS_PATH}/ || die
-   done
-
-   dosym ${WINGS_PATH} ${ERL_PATH}/${PN}
-   dosym ${ESDL_PATH} ${ERL_PATH}/esdl
-   newbin "${FILESDIR}"/wings.sh wings
-   dodoc AUTHORS README
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2018-03-17 Thread Matt Turner
commit: 144948ffbbb3229aac5aba6120ae8563cd811401
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Mar 17 06:55:48 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Mar 17 06:55:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=144948ff

media-gfx/wings: Drop ppc/ppc64 keywords

 media-gfx/wings/wings-1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/wings/wings-1.1.1.ebuild 
b/media-gfx/wings/wings-1.1.1.ebuild
index 7e6492f3af4..3497dec8eba 100644
--- a/media-gfx/wings/wings-1.1.1.ebuild
+++ b/media-gfx/wings/wings-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/erlang-13.0



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2018-03-13 Thread Jeroen Roovers
commit: dbea6c577ae2ab984e1c38d380702f7eec4e36b3
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Mar 13 21:32:57 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Mar 13 21:55:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbea6c57

media-gfx/wings: Version 2.1.6.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/wings/Manifest   |  1 +
 media-gfx/wings/wings-2.1.6.ebuild | 63 ++
 2 files changed, 64 insertions(+)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 6cd3267c848..21e06722dd4 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,2 +1,3 @@
 DIST wings-1.1.1.tar.bz2 1932572 BLAKE2B 
9899d17355983c3b9c7beea87b1a94e665f194f5e0935d992389f8ea29a511a4682b4b1953316ea41ba1d09a9a474ebf5fd757fe4bf3638ebecf9c7faf1403aa
 SHA512 
e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 
10b14e8dd29daf74fd6af9229341296fa457df405542274533df85198d932188c53094afffbc4b09342c29086df02a7e19d4983f1fc912623ea79ae85e9d4067
 SHA512 
37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
+DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 
9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244
 SHA512 
db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7

diff --git a/media-gfx/wings/wings-2.1.6.ebuild 
b/media-gfx/wings/wings-2.1.6.ebuild
new file mode 100644
index 000..bc645abc423
--- /dev/null
+++ b/media-gfx/wings/wings-2.1.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/;
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   >=dev-lang/erlang-18.1[smp,wxwidgets]
+   dev-libs/cl
+   media-libs/glu
+   media-libs/libsdl[opengl]
+   virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e '/include_lib/s|"wings/|"../|' \
+   $(find . -name '*'.erl) \
+   || die
+
+   sed -i \
+   -e 's|-O3||g' \
+   -e 's|-Werror||g' \
+   -e 's|CFLAGS = |CFLAGS += |g' \
+   $(find . -name Makefile) \
+   || die
+}
+
+src_configure() {
+   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+}
+
+src_compile() {
+   # Work around parallel make issues
+   emake vsn.mk
+   for subdir in intl_tools src e3d icons plugins_src; do
+   emake -C ${subdir}
+   done
+}
+
+src_install() {
+   WINGS_PATH=${ERL_PATH}/${P}
+   dodir ${WINGS_PATH}
+
+   find -name 'Makefile*' -exec rm -f '{}' \;
+
+   insinto ${WINGS_PATH}
+   doins -r e3d ebin icons plugins psd shaders src textures tools
+
+   newbin "${FILESDIR}"/wings.sh-r1 wings
+   dodoc AUTHORS README
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2017-11-12 Thread Jeroen Roovers
commit: fcd1c36bd2230d833d46431f61142b7e26aade9b
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Nov 12 11:57:51 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Nov 12 11:58:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcd1c36b

media-gfx/wings: Drop some compiler flags (bug #630406). Fix dependencies.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-gfx/wings/wings-2.1.5.ebuild | 9 +
 1 file changed, 9 insertions(+)

diff --git a/media-gfx/wings/wings-2.1.5.ebuild 
b/media-gfx/wings/wings-2.1.5.ebuild
index 212860eb8a2..e8f31fd40fc 100644
--- a/media-gfx/wings/wings-2.1.5.ebuild
+++ b/media-gfx/wings/wings-2.1.5.ebuild
@@ -15,7 +15,9 @@ KEYWORDS="amd64 x86"
 RDEPEND="
>=dev-lang/erlang-18.1[smp,wxwidgets]
dev-libs/cl
+   media-libs/glu
media-libs/libsdl[opengl]
+   virtual/opengl
 "
 DEPEND="${RDEPEND}"
 
@@ -26,6 +28,13 @@ src_prepare() {
-e '/include_lib/s|"wings/|"../|' \
$(find . -name '*'.erl) \
|| die
+
+   sed -i \
+   -e 's|-O3||g' \
+   -e 's|-Werror||g' \
+   -e 's|CFLAGS = |CFLAGS += |g' \
+   $(find . -name Makefile) \
+   || die
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2017-04-22 Thread Jeroen Roovers
commit: 40bb3287f3e23c658fb91232246152cf7c4d0499
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Apr 22 09:19:02 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Apr 22 09:19:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40bb3287

media-gfx/wings: Old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/wings/Manifest  |  2 --
 media-gfx/wings/wings-1.5.4-r2.ebuild | 56 ---
 media-gfx/wings/wings-2.1.4.1.ebuild  | 54 -
 3 files changed, 112 deletions(-)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 7391f2ef2f8..89c2cde32a2 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,4 +1,2 @@
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 
1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 
e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 WHIRLPOOL 
9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
-DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 
fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f
 WHIRLPOOL 
1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
-DIST wings-2.1.4.1.tar.bz2 2654576 SHA256 
5a827551fb2bd94db330d8b83bd2b6ca83f02394e6ceb56e2452d2decea0191e SHA512 
55258877e5592abd64abb03d498d9d40f3fffb937cd05d05ccbf9eab58953430b3c17cf44d1df8d22c0aa05b7c95c83c26cc3638bda8244b7b9cbffb922c6872
 WHIRLPOOL 
f530ee3a63e49236af8919aeeed667a11e2816123ab5d0357d2afcff7ab8d78cd5b187f6f724927f9e26d10a55fc4e0367413ad3936e3ad835c30a2efe449953
 DIST wings-2.1.5.tar.bz2 2653117 SHA256 
f0f03cfe9f0ee0ee6c734a2b7e50410d5f21238441cb1f34422b0ecde25b582c SHA512 
37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
 WHIRLPOOL 
3fd9c2008de69a6534d95c4e54d0b27d53e91efbfcabee5090abba03e23a25f8dea4a9ce5d9ec543e59dd2e773bb3ed2ad13c2824027bbe78296dad37a8db768

diff --git a/media-gfx/wings/wings-1.5.4-r2.ebuild 
b/media-gfx/wings/wings-1.5.4-r2.ebuild
deleted file mode 100644
index 58038b5d41d..000
--- a/media-gfx/wings/wings-1.5.4-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/;
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   >=dev-lang/erlang-17.0[wxwidgets]
-   >=media-libs/esdl-1.0.1
-   dev-libs/cl
-   media-libs/libsdl[opengl]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   sed -i \
-   -e '/include_lib/s|"wings/|"../|' \
-   $(find . -name '*'.erl) \
-   || die
-
-   eapply_user
-}
-
-src_configure() {
-   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-   export ESDL_PATH="${ERL_PATH}/$(best_version media-libs/esdl | cut -d/ 
-f2)"
-}
-
-src_compile() {
-   # Work around parallel make issues
-   emake vsn.mk
-   for subdir in intl_tools src fonts_src e3d icons plugins_src; do
-   emake ESDL_PATH="${ESDL_PATH}" -C ${subdir}
-   done
-}
-
-src_install() {
-   WINGS_PATH=${ERL_PATH}/${P}
-   dodir ${WINGS_PATH}
-
-   find -name 'Makefile*' -exec rm -f '{}' \;
-
-   insinto ${WINGS_PATH}
-   doins -r e3d ebin fonts icons plugins psd shaders src textures tools
-
-   newbin "${FILESDIR}"/wings.sh wings
-   dodoc AUTHORS README
-}

diff --git a/media-gfx/wings/wings-2.1.4.1.ebuild 
b/media-gfx/wings/wings-2.1.4.1.ebuild
deleted file mode 100644
index bc672fde4a0..000
--- a/media-gfx/wings/wings-2.1.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/;
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   >=dev-lang/erlang-18.1[smp,wxwidgets]
-   dev-libs/cl
-   media-libs/libsdl[opengl]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   default
-
-   sed -i \
-   -e '/include_lib/s|"wings/|"../|' \
-   $(find . -name '*'.erl) \
-   || die
-}
-
-src_configure() {
-   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
-   # Work around parallel make issues
-   emake vsn.mk
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2017-02-20 Thread Jeroen Roovers
commit: b6b02fd27ba7a2fc457d11cba0469ee41373e467
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Feb 21 05:56:27 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Feb 21 05:56:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b02fd2

media-gfx/wings: Stable for AMD64 x86 (bug #590052).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 media-gfx/wings/wings-2.1.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/wings/wings-2.1.5.ebuild 
b/media-gfx/wings/wings-2.1.5.ebuild
index d02d928393..4cbdeb2ff0 100644
--- a/media-gfx/wings/wings-2.1.5.ebuild
+++ b/media-gfx/wings/wings-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
>=dev-lang/erlang-18.1[smp,wxwidgets]



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-12-17 Thread Jeroen Roovers
commit: 3d8777b4988321481a30b0cf21aeccf2de1efbc3
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Dec 17 13:28:44 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Dec 17 13:29:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d8777b4

media-gfx/wings: Version bump.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/wings/Manifest   |  1 +
 media-gfx/wings/wings-2.1.5.ebuild | 55 ++
 2 files changed, 56 insertions(+)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index b1146a0..473efc7 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -2,3 +2,4 @@ DIST wings-1.1.1.tar.bz2 1932572 SHA256 
1a75a39a1a4586b242558a879d611adf1566b867
 DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 
fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f
 WHIRLPOOL 
1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
 DIST wings-2.1.3.tar.bz2 2651435 SHA256 
065029529ee3e9d5d9e38e0dc5b1187c43964861d8ab46df2b134d45fa937c13 SHA512 
db6f26e7bf5788f02c0c0a8d9a35a1dc11a66e54cac0f36bd7f688c0a00c5d7c8ab16db2d6fbc72b710187215aa0508a23692212138f0d7f466770bf7ee6db6c
 WHIRLPOOL 
c280d51afd8de6040cc24af02b8560d2a7a282750a7cd5d4bbba8514256c63bcd6b77fdf40e6df82d0fab4a928506d331f5ad74056434ff075b06bef05fb274e
 DIST wings-2.1.4.1.tar.bz2 2654576 SHA256 
5a827551fb2bd94db330d8b83bd2b6ca83f02394e6ceb56e2452d2decea0191e SHA512 
55258877e5592abd64abb03d498d9d40f3fffb937cd05d05ccbf9eab58953430b3c17cf44d1df8d22c0aa05b7c95c83c26cc3638bda8244b7b9cbffb922c6872
 WHIRLPOOL 
f530ee3a63e49236af8919aeeed667a11e2816123ab5d0357d2afcff7ab8d78cd5b187f6f724927f9e26d10a55fc4e0367413ad3936e3ad835c30a2efe449953
+DIST wings-2.1.5.tar.bz2 2653117 SHA256 
f0f03cfe9f0ee0ee6c734a2b7e50410d5f21238441cb1f34422b0ecde25b582c SHA512 
37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
 WHIRLPOOL 
3fd9c2008de69a6534d95c4e54d0b27d53e91efbfcabee5090abba03e23a25f8dea4a9ce5d9ec543e59dd2e773bb3ed2ad13c2824027bbe78296dad37a8db768

diff --git a/media-gfx/wings/wings-2.1.5.ebuild 
b/media-gfx/wings/wings-2.1.5.ebuild
new file mode 100644
index ..d02d928
--- /dev/null
+++ b/media-gfx/wings/wings-2.1.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/;
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   >=dev-lang/erlang-18.1[smp,wxwidgets]
+   dev-libs/cl
+   media-libs/libsdl[opengl]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e '/include_lib/s|"wings/|"../|' \
+   $(find . -name '*'.erl) \
+   || die
+}
+
+src_configure() {
+   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+}
+
+src_compile() {
+   # Work around parallel make issues
+   emake vsn.mk
+   for subdir in intl_tools src e3d icons plugins_src; do
+   emake -C ${subdir}
+   done
+}
+
+src_install() {
+   WINGS_PATH=${ERL_PATH}/${P}
+   dodir ${WINGS_PATH}
+
+   find -name 'Makefile*' -exec rm -f '{}' \;
+
+   insinto ${WINGS_PATH}
+   doins -r e3d ebin icons plugins psd shaders src textures tools
+
+   newbin "${FILESDIR}"/wings.sh-r1 wings
+   dodoc AUTHORS README
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-12-17 Thread Jeroen Roovers
commit: c470ef9d23cf090d7fb0ef8d3f43c13493b39f3f
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Dec 17 13:29:14 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Dec 17 13:29:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c470ef9d

media-gfx/wings: Old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/wings/Manifest   |  1 -
 media-gfx/wings/wings-2.1.3.ebuild | 55 --
 2 files changed, 56 deletions(-)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 473efc7..7391f2e 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,5 +1,4 @@
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 
1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 
e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 WHIRLPOOL 
9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
 DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 
fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f
 WHIRLPOOL 
1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
-DIST wings-2.1.3.tar.bz2 2651435 SHA256 
065029529ee3e9d5d9e38e0dc5b1187c43964861d8ab46df2b134d45fa937c13 SHA512 
db6f26e7bf5788f02c0c0a8d9a35a1dc11a66e54cac0f36bd7f688c0a00c5d7c8ab16db2d6fbc72b710187215aa0508a23692212138f0d7f466770bf7ee6db6c
 WHIRLPOOL 
c280d51afd8de6040cc24af02b8560d2a7a282750a7cd5d4bbba8514256c63bcd6b77fdf40e6df82d0fab4a928506d331f5ad74056434ff075b06bef05fb274e
 DIST wings-2.1.4.1.tar.bz2 2654576 SHA256 
5a827551fb2bd94db330d8b83bd2b6ca83f02394e6ceb56e2452d2decea0191e SHA512 
55258877e5592abd64abb03d498d9d40f3fffb937cd05d05ccbf9eab58953430b3c17cf44d1df8d22c0aa05b7c95c83c26cc3638bda8244b7b9cbffb922c6872
 WHIRLPOOL 
f530ee3a63e49236af8919aeeed667a11e2816123ab5d0357d2afcff7ab8d78cd5b187f6f724927f9e26d10a55fc4e0367413ad3936e3ad835c30a2efe449953
 DIST wings-2.1.5.tar.bz2 2653117 SHA256 
f0f03cfe9f0ee0ee6c734a2b7e50410d5f21238441cb1f34422b0ecde25b582c SHA512 
37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
 WHIRLPOOL 
3fd9c2008de69a6534d95c4e54d0b27d53e91efbfcabee5090abba03e23a25f8dea4a9ce5d9ec543e59dd2e773bb3ed2ad13c2824027bbe78296dad37a8db768

diff --git a/media-gfx/wings/wings-2.1.3.ebuild 
b/media-gfx/wings/wings-2.1.3.ebuild
deleted file mode 100644
index d02d928..
--- a/media-gfx/wings/wings-2.1.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/;
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   >=dev-lang/erlang-18.1[smp,wxwidgets]
-   dev-libs/cl
-   media-libs/libsdl[opengl]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   default
-
-   sed -i \
-   -e '/include_lib/s|"wings/|"../|' \
-   $(find . -name '*'.erl) \
-   || die
-}
-
-src_configure() {
-   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
-   # Work around parallel make issues
-   emake vsn.mk
-   for subdir in intl_tools src e3d icons plugins_src; do
-   emake -C ${subdir}
-   done
-}
-
-src_install() {
-   WINGS_PATH=${ERL_PATH}/${P}
-   dodir ${WINGS_PATH}
-
-   find -name 'Makefile*' -exec rm -f '{}' \;
-
-   insinto ${WINGS_PATH}
-   doins -r e3d ebin icons plugins psd shaders src textures tools
-
-   newbin "${FILESDIR}"/wings.sh-r1 wings
-   dodoc AUTHORS README
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-12-15 Thread Jeroen Roovers
commit: 8c7e5938a5b0c1815546d7affa578f397fe37e91
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Dec 15 17:18:27 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Dec 15 17:21:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7e5938

media-gfx/wings: Version bump.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/wings/Manifest |  1 +
 media-gfx/wings/wings-2.1.4.1.ebuild | 55 
 2 files changed, 56 insertions(+)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 51fccf2..26d7fd6 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -3,3 +3,4 @@ DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b
 DIST wings-2.0.5.tar.bz2 2455836 SHA256 
318b6f9479b04882f2307b60d78a0020d305ce66ee3293e22cc36bde2a7fe360 SHA512 
d116c4d23043f79f80ecb76c9a0d2d0dec12169fb382ca0fc84a78c462541072ec7820bfbbaadfae39aee2a07512f346b845d3f4c6e133f2d80b0d12b07907b1
 WHIRLPOOL 
51bc7cf6a9bbfa02e04adda8d132ba06df848b822d0836fb66c437571a72d6603adab483407d4c7e037523485f021d92d030f261fb4e614813540178a1bb
 DIST wings-2.1.2.tar.bz2 2650466 SHA256 
855fd2466a9b5a85e7913ed7cb5fdb67c794ca4a305a199cc29f0b4960694f65 SHA512 
fd4ad597583061167e274351459110efabe7d558fc6cdb22256caa22a3357f815f14f6cbc0529adec337f5c10e8dc75b26f63453b42218e04bda54ff9af92ecd
 WHIRLPOOL 
3271edf8f2cf9109c3f4a70790772232e0b1f97432916833d56d17133f4d2ea67c247ea1073d33a1cb09c8b0ff13a20602de235d47245224b9d7a3f3a6833827
 DIST wings-2.1.3.tar.bz2 2651435 SHA256 
065029529ee3e9d5d9e38e0dc5b1187c43964861d8ab46df2b134d45fa937c13 SHA512 
db6f26e7bf5788f02c0c0a8d9a35a1dc11a66e54cac0f36bd7f688c0a00c5d7c8ab16db2d6fbc72b710187215aa0508a23692212138f0d7f466770bf7ee6db6c
 WHIRLPOOL 
c280d51afd8de6040cc24af02b8560d2a7a282750a7cd5d4bbba8514256c63bcd6b77fdf40e6df82d0fab4a928506d331f5ad74056434ff075b06bef05fb274e
+DIST wings-2.1.4.1.tar.bz2 2654576 SHA256 
5a827551fb2bd94db330d8b83bd2b6ca83f02394e6ceb56e2452d2decea0191e SHA512 
55258877e5592abd64abb03d498d9d40f3fffb937cd05d05ccbf9eab58953430b3c17cf44d1df8d22c0aa05b7c95c83c26cc3638bda8244b7b9cbffb922c6872
 WHIRLPOOL 
f530ee3a63e49236af8919aeeed667a11e2816123ab5d0357d2afcff7ab8d78cd5b187f6f724927f9e26d10a55fc4e0367413ad3936e3ad835c30a2efe449953

diff --git a/media-gfx/wings/wings-2.1.4.1.ebuild 
b/media-gfx/wings/wings-2.1.4.1.ebuild
new file mode 100644
index ..d02d928
--- /dev/null
+++ b/media-gfx/wings/wings-2.1.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/;
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   >=dev-lang/erlang-18.1[smp,wxwidgets]
+   dev-libs/cl
+   media-libs/libsdl[opengl]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e '/include_lib/s|"wings/|"../|' \
+   $(find . -name '*'.erl) \
+   || die
+}
+
+src_configure() {
+   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+}
+
+src_compile() {
+   # Work around parallel make issues
+   emake vsn.mk
+   for subdir in intl_tools src e3d icons plugins_src; do
+   emake -C ${subdir}
+   done
+}
+
+src_install() {
+   WINGS_PATH=${ERL_PATH}/${P}
+   dodir ${WINGS_PATH}
+
+   find -name 'Makefile*' -exec rm -f '{}' \;
+
+   insinto ${WINGS_PATH}
+   doins -r e3d ebin icons plugins psd shaders src textures tools
+
+   newbin "${FILESDIR}"/wings.sh-r1 wings
+   dodoc AUTHORS README
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-12-15 Thread Jeroen Roovers
commit: a0cbee754554dd56e09e19e07a9d2c2e635711dd
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Dec 15 17:21:33 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Dec 15 17:21:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0cbee75

media-gfx/wings: Old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/wings/Manifest   |  2 --
 media-gfx/wings/wings-2.0.5.ebuild | 55 --
 media-gfx/wings/wings-2.1.2.ebuild | 55 --
 3 files changed, 112 deletions(-)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 26d7fd6..b1146a0 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,6 +1,4 @@
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 
1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 
e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 WHIRLPOOL 
9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
 DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 
fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f
 WHIRLPOOL 
1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
-DIST wings-2.0.5.tar.bz2 2455836 SHA256 
318b6f9479b04882f2307b60d78a0020d305ce66ee3293e22cc36bde2a7fe360 SHA512 
d116c4d23043f79f80ecb76c9a0d2d0dec12169fb382ca0fc84a78c462541072ec7820bfbbaadfae39aee2a07512f346b845d3f4c6e133f2d80b0d12b07907b1
 WHIRLPOOL 
51bc7cf6a9bbfa02e04adda8d132ba06df848b822d0836fb66c437571a72d6603adab483407d4c7e037523485f021d92d030f261fb4e614813540178a1bb
-DIST wings-2.1.2.tar.bz2 2650466 SHA256 
855fd2466a9b5a85e7913ed7cb5fdb67c794ca4a305a199cc29f0b4960694f65 SHA512 
fd4ad597583061167e274351459110efabe7d558fc6cdb22256caa22a3357f815f14f6cbc0529adec337f5c10e8dc75b26f63453b42218e04bda54ff9af92ecd
 WHIRLPOOL 
3271edf8f2cf9109c3f4a70790772232e0b1f97432916833d56d17133f4d2ea67c247ea1073d33a1cb09c8b0ff13a20602de235d47245224b9d7a3f3a6833827
 DIST wings-2.1.3.tar.bz2 2651435 SHA256 
065029529ee3e9d5d9e38e0dc5b1187c43964861d8ab46df2b134d45fa937c13 SHA512 
db6f26e7bf5788f02c0c0a8d9a35a1dc11a66e54cac0f36bd7f688c0a00c5d7c8ab16db2d6fbc72b710187215aa0508a23692212138f0d7f466770bf7ee6db6c
 WHIRLPOOL 
c280d51afd8de6040cc24af02b8560d2a7a282750a7cd5d4bbba8514256c63bcd6b77fdf40e6df82d0fab4a928506d331f5ad74056434ff075b06bef05fb274e
 DIST wings-2.1.4.1.tar.bz2 2654576 SHA256 
5a827551fb2bd94db330d8b83bd2b6ca83f02394e6ceb56e2452d2decea0191e SHA512 
55258877e5592abd64abb03d498d9d40f3fffb937cd05d05ccbf9eab58953430b3c17cf44d1df8d22c0aa05b7c95c83c26cc3638bda8244b7b9cbffb922c6872
 WHIRLPOOL 
f530ee3a63e49236af8919aeeed667a11e2816123ab5d0357d2afcff7ab8d78cd5b187f6f724927f9e26d10a55fc4e0367413ad3936e3ad835c30a2efe449953

diff --git a/media-gfx/wings/wings-2.0.5.ebuild 
b/media-gfx/wings/wings-2.0.5.ebuild
deleted file mode 100644
index 9b046f2..
--- a/media-gfx/wings/wings-2.0.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/;
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   >=dev-lang/erlang-18.1[smp,wxwidgets]
-   dev-libs/cl
-   media-libs/libsdl[opengl]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   sed -i \
-   -e '/include_lib/s|"wings/|"../|' \
-   $(find . -name '*'.erl) \
-   || die
-
-   eapply_user
-}
-
-src_configure() {
-   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
-   # Work around parallel make issues
-   emake vsn.mk
-   for subdir in intl_tools src e3d icons plugins_src; do
-   emake -C ${subdir}
-   done
-}
-
-src_install() {
-   WINGS_PATH=${ERL_PATH}/${P}
-   dodir ${WINGS_PATH}
-
-   find -name 'Makefile*' -exec rm -f '{}' \;
-
-   insinto ${WINGS_PATH}
-   doins -r e3d ebin icons plugins psd shaders src textures tools
-
-   newbin "${FILESDIR}"/wings.sh-r1 wings
-   dodoc AUTHORS README
-}

diff --git a/media-gfx/wings/wings-2.1.2.ebuild 
b/media-gfx/wings/wings-2.1.2.ebuild
deleted file mode 100644
index d02d928..
--- a/media-gfx/wings/wings-2.1.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-11-18 Thread Jeroen Roovers
commit: 4e4d484a83eae078772dd1f3ed1cabd31f2e1102
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Nov 18 22:19:27 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Nov 18 22:20:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4d484a

media-gfx/wings: Version bump.

Package-Manager: portage-2.3.2

 media-gfx/wings/Manifest   |  1 +
 media-gfx/wings/wings-2.1.3.ebuild | 55 ++
 2 files changed, 56 insertions(+)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 1e7fcc9..06b56d5 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -2,4 +2,5 @@ DIST wings-1.1.1.tar.bz2 1932572 SHA256 
1a75a39a1a4586b242558a879d611adf1566b867
 DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 
fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f
 WHIRLPOOL 
1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
 DIST wings-2.0.5.tar.bz2 2455836 SHA256 
318b6f9479b04882f2307b60d78a0020d305ce66ee3293e22cc36bde2a7fe360 SHA512 
d116c4d23043f79f80ecb76c9a0d2d0dec12169fb382ca0fc84a78c462541072ec7820bfbbaadfae39aee2a07512f346b845d3f4c6e133f2d80b0d12b07907b1
 WHIRLPOOL 
51bc7cf6a9bbfa02e04adda8d132ba06df848b822d0836fb66c437571a72d6603adab483407d4c7e037523485f021d92d030f261fb4e614813540178a1bb
 DIST wings-2.1.2.tar.bz2 2650466 SHA256 
855fd2466a9b5a85e7913ed7cb5fdb67c794ca4a305a199cc29f0b4960694f65 SHA512 
fd4ad597583061167e274351459110efabe7d558fc6cdb22256caa22a3357f815f14f6cbc0529adec337f5c10e8dc75b26f63453b42218e04bda54ff9af92ecd
 WHIRLPOOL 
3271edf8f2cf9109c3f4a70790772232e0b1f97432916833d56d17133f4d2ea67c247ea1073d33a1cb09c8b0ff13a20602de235d47245224b9d7a3f3a6833827
+DIST wings-2.1.3.tar.bz2 2651435 SHA256 
065029529ee3e9d5d9e38e0dc5b1187c43964861d8ab46df2b134d45fa937c13 SHA512 
db6f26e7bf5788f02c0c0a8d9a35a1dc11a66e54cac0f36bd7f688c0a00c5d7c8ab16db2d6fbc72b710187215aa0508a23692212138f0d7f466770bf7ee6db6c
 WHIRLPOOL 
c280d51afd8de6040cc24af02b8560d2a7a282750a7cd5d4bbba8514256c63bcd6b77fdf40e6df82d0fab4a928506d331f5ad74056434ff075b06bef05fb274e
 DIST wings-2.1.tar.bz2 2647932 SHA256 
9a878a76f4003d8ea54b17ed492b7aad68b3f191169e4a140b9ff7d981927a34 SHA512 
92a8b7b749117f382add0c724aad1996dfd7b57034557e354d5ebf7f7d7355df84cb708e7decbeadb573d4bc93a1e3c39a7afbde0fe949f07c5016079c712313
 WHIRLPOOL 
1ba9c19a168ea5b3ecabc720b437cccf78015e42bb2bc81e5efd9f330dcbefa1544b8551b59553249202fb6b5bc4f0f05375d85341f6ec972fa3dbb9f7993142

diff --git a/media-gfx/wings/wings-2.1.3.ebuild 
b/media-gfx/wings/wings-2.1.3.ebuild
new file mode 100644
index ..d02d928
--- /dev/null
+++ b/media-gfx/wings/wings-2.1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/;
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   >=dev-lang/erlang-18.1[smp,wxwidgets]
+   dev-libs/cl
+   media-libs/libsdl[opengl]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e '/include_lib/s|"wings/|"../|' \
+   $(find . -name '*'.erl) \
+   || die
+}
+
+src_configure() {
+   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+}
+
+src_compile() {
+   # Work around parallel make issues
+   emake vsn.mk
+   for subdir in intl_tools src e3d icons plugins_src; do
+   emake -C ${subdir}
+   done
+}
+
+src_install() {
+   WINGS_PATH=${ERL_PATH}/${P}
+   dodir ${WINGS_PATH}
+
+   find -name 'Makefile*' -exec rm -f '{}' \;
+
+   insinto ${WINGS_PATH}
+   doins -r e3d ebin icons plugins psd shaders src textures tools
+
+   newbin "${FILESDIR}"/wings.sh-r1 wings
+   dodoc AUTHORS README
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/files/, media-gfx/wings/

2016-11-18 Thread Jeroen Roovers
commit: 07db1e5e6836b3434299e6b7db374f6c3f8c5cbe
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Nov 18 22:20:12 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Nov 18 22:20:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07db1e5e

media-gfx/wings: Old.

Package-Manager: portage-2.3.2

 media-gfx/wings/Manifest |  1 -
 media-gfx/wings/files/wings-2.1-wx.patch | 69 
 media-gfx/wings/wings-2.1.ebuild | 59 ---
 3 files changed, 129 deletions(-)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 06b56d5..51fccf2 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -3,4 +3,3 @@ DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b
 DIST wings-2.0.5.tar.bz2 2455836 SHA256 
318b6f9479b04882f2307b60d78a0020d305ce66ee3293e22cc36bde2a7fe360 SHA512 
d116c4d23043f79f80ecb76c9a0d2d0dec12169fb382ca0fc84a78c462541072ec7820bfbbaadfae39aee2a07512f346b845d3f4c6e133f2d80b0d12b07907b1
 WHIRLPOOL 
51bc7cf6a9bbfa02e04adda8d132ba06df848b822d0836fb66c437571a72d6603adab483407d4c7e037523485f021d92d030f261fb4e614813540178a1bb
 DIST wings-2.1.2.tar.bz2 2650466 SHA256 
855fd2466a9b5a85e7913ed7cb5fdb67c794ca4a305a199cc29f0b4960694f65 SHA512 
fd4ad597583061167e274351459110efabe7d558fc6cdb22256caa22a3357f815f14f6cbc0529adec337f5c10e8dc75b26f63453b42218e04bda54ff9af92ecd
 WHIRLPOOL 
3271edf8f2cf9109c3f4a70790772232e0b1f97432916833d56d17133f4d2ea67c247ea1073d33a1cb09c8b0ff13a20602de235d47245224b9d7a3f3a6833827
 DIST wings-2.1.3.tar.bz2 2651435 SHA256 
065029529ee3e9d5d9e38e0dc5b1187c43964861d8ab46df2b134d45fa937c13 SHA512 
db6f26e7bf5788f02c0c0a8d9a35a1dc11a66e54cac0f36bd7f688c0a00c5d7c8ab16db2d6fbc72b710187215aa0508a23692212138f0d7f466770bf7ee6db6c
 WHIRLPOOL 
c280d51afd8de6040cc24af02b8560d2a7a282750a7cd5d4bbba8514256c63bcd6b77fdf40e6df82d0fab4a928506d331f5ad74056434ff075b06bef05fb274e
-DIST wings-2.1.tar.bz2 2647932 SHA256 
9a878a76f4003d8ea54b17ed492b7aad68b3f191169e4a140b9ff7d981927a34 SHA512 
92a8b7b749117f382add0c724aad1996dfd7b57034557e354d5ebf7f7d7355df84cb708e7decbeadb573d4bc93a1e3c39a7afbde0fe949f07c5016079c712313
 WHIRLPOOL 
1ba9c19a168ea5b3ecabc720b437cccf78015e42bb2bc81e5efd9f330dcbefa1544b8551b59553249202fb6b5bc4f0f05375d85341f6ec972fa3dbb9f7993142

diff --git a/media-gfx/wings/files/wings-2.1-wx.patch 
b/media-gfx/wings/files/wings-2.1-wx.patch
deleted file mode 100644
index b59449d..
--- a/media-gfx/wings/files/wings-2.1-wx.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/icons/Makefile b/icons/Makefile
-index 4e5a43d..8622b38 100644
 a/icons/Makefile
-+++ b/icons/Makefile
-@@ -31,7 +31,7 @@ PS_ICONS=$(patsubst %,bluecube/%,$(notdir $(GEN_PS_ICONS)))
- # 
- # FLAGS
- # 
--ERL_FLAGS += 
-+ERL_FLAGS += -pa ../ebin
- ERL_COMPILE_FLAGS += -Werror +debug_info
- 
- # 
-diff --git a/icons/collect_bmp.erl b/icons/collect_bmp.erl
-index 073fe73..e29d232 100644
 a/icons/collect_bmp.erl
-+++ b/icons/collect_bmp.erl
-@@ -13,23 +13,21 @@
- 
- -module(collect_bmp).
- -export([start/0,start/1]).
---import(lists, [reverse/1]).
-+
-+-include_lib("wings/e3d/e3d_image.hrl").
- 
- start() ->
- start(["icons","wings_icon.bundle"]).
- 
- start(Args) ->
--io:put_chars("Loading"),
- do_start(Args, []).
- 
- do_start([InDir|[_|_]=T], Files) ->
- do_start(T, add_files(InDir, Files));
- do_start([OutFile], Files) ->
--wx:new(),
- Icons = load_icons(Files),
--io:nl(),
- Bin = term_to_binary(Icons, [compressed]),
--io:format("Writing ~s\n", [OutFile]),
-+%% io:format("Writing ~s\n", [OutFile]),
- ok = file:write_file(OutFile, Bin).
- 
- add_files(Dir, Acc) ->
-@@ -42,14 +40,16 @@ load_icons([Name|Ns]) ->
- load_icons([]) -> [].
- 
- load_icon(Name) ->
--Image = wxImage:new(Name),
--wxImage:ok(Image) orelse exit({failed_to_load, Name}),
--W = wxImage:getWidth(Image),
--H = wxImage:getHeight(Image),
--RGB = wxImage:getData(Image),
--case wxImage:hasAlpha(Image) of
--  true ->  {4,W,H,RGB,wxImage:getAlpha(Image)};
--  false -> {3,W,H,RGB, <<>>}
-+case e3d_image:load(Name) of
-+#e3d_image{bytes_pp=4, width=W, height=H} = I ->
-+#e3d_image{image=RGB} = e3d_image:convert(I, r8g8b8, 1, 
upper_left),
-+#e3d_image{image=Alpha} = e3d_image:convert(I, a8, 1, upper_left),
-+{4,W,H,RGB,Alpha};
-+#e3d_image{bytes_pp=3, width=W, height=H} = I ->
-+#e3d_image{image=RGB} = e3d_image:convert(I, r8g8b8, 1, 
upper_left),
-+{3,W,H,RGB,<<>>};
-+_ ->
-+exit({failed_to_load, Name})
- end.
- 
- 

diff --git a/media-gfx/wings/wings-2.1.ebuild b/media-gfx/wings/wings-2.1.ebuild
deleted file mode 100644
index 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-11-07 Thread Jeroen Roovers
commit: a859f90c3dee83626130a8f1d22a52045bc1baf3
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Nov  7 08:43:17 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Nov  7 08:43:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a859f90c

media-gfx/wings: Version bump.

Package-Manager: portage-2.3.2

 media-gfx/wings/Manifest   |  1 +
 media-gfx/wings/wings-2.1.2.ebuild | 55 ++
 2 files changed, 56 insertions(+)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 38657d2..1e7fcc9 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,4 +1,5 @@
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 
1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 
e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 WHIRLPOOL 
9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
 DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 
fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f
 WHIRLPOOL 
1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
 DIST wings-2.0.5.tar.bz2 2455836 SHA256 
318b6f9479b04882f2307b60d78a0020d305ce66ee3293e22cc36bde2a7fe360 SHA512 
d116c4d23043f79f80ecb76c9a0d2d0dec12169fb382ca0fc84a78c462541072ec7820bfbbaadfae39aee2a07512f346b845d3f4c6e133f2d80b0d12b07907b1
 WHIRLPOOL 
51bc7cf6a9bbfa02e04adda8d132ba06df848b822d0836fb66c437571a72d6603adab483407d4c7e037523485f021d92d030f261fb4e614813540178a1bb
+DIST wings-2.1.2.tar.bz2 2650466 SHA256 
855fd2466a9b5a85e7913ed7cb5fdb67c794ca4a305a199cc29f0b4960694f65 SHA512 
fd4ad597583061167e274351459110efabe7d558fc6cdb22256caa22a3357f815f14f6cbc0529adec337f5c10e8dc75b26f63453b42218e04bda54ff9af92ecd
 WHIRLPOOL 
3271edf8f2cf9109c3f4a70790772232e0b1f97432916833d56d17133f4d2ea67c247ea1073d33a1cb09c8b0ff13a20602de235d47245224b9d7a3f3a6833827
 DIST wings-2.1.tar.bz2 2647932 SHA256 
9a878a76f4003d8ea54b17ed492b7aad68b3f191169e4a140b9ff7d981927a34 SHA512 
92a8b7b749117f382add0c724aad1996dfd7b57034557e354d5ebf7f7d7355df84cb708e7decbeadb573d4bc93a1e3c39a7afbde0fe949f07c5016079c712313
 WHIRLPOOL 
1ba9c19a168ea5b3ecabc720b437cccf78015e42bb2bc81e5efd9f330dcbefa1544b8551b59553249202fb6b5bc4f0f05375d85341f6ec972fa3dbb9f7993142

diff --git a/media-gfx/wings/wings-2.1.2.ebuild 
b/media-gfx/wings/wings-2.1.2.ebuild
new file mode 100644
index ..d02d928
--- /dev/null
+++ b/media-gfx/wings/wings-2.1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/;
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   >=dev-lang/erlang-18.1[smp,wxwidgets]
+   dev-libs/cl
+   media-libs/libsdl[opengl]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e '/include_lib/s|"wings/|"../|' \
+   $(find . -name '*'.erl) \
+   || die
+}
+
+src_configure() {
+   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+}
+
+src_compile() {
+   # Work around parallel make issues
+   emake vsn.mk
+   for subdir in intl_tools src e3d icons plugins_src; do
+   emake -C ${subdir}
+   done
+}
+
+src_install() {
+   WINGS_PATH=${ERL_PATH}/${P}
+   dodir ${WINGS_PATH}
+
+   find -name 'Makefile*' -exec rm -f '{}' \;
+
+   insinto ${WINGS_PATH}
+   doins -r e3d ebin icons plugins psd shaders src textures tools
+
+   newbin "${FILESDIR}"/wings.sh-r1 wings
+   dodoc AUTHORS README
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-10-30 Thread Jeroen Roovers
commit: 320b2f4848d4f67cd193ec79836ce798330dc218
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Oct 30 08:10:52 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Oct 30 08:18:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320b2f48

media-gfx/wings: Make sure the sed script additionally fixes what the upstream 
patch touched (maybe bug #598482).

Package-Manager: portage-2.3.2

 media-gfx/wings/wings-2.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/wings/wings-2.1.ebuild b/media-gfx/wings/wings-2.1.ebuild
index c441d9d..ae450f3 100644
--- a/media-gfx/wings/wings-2.1.ebuild
+++ b/media-gfx/wings/wings-2.1.ebuild
@@ -25,12 +25,12 @@ PATCHES=(
 )
 
 src_prepare() {
+   default
+
sed -i \
-e '/include_lib/s|"wings/|"../|' \
$(find . -name '*'.erl) \
|| die
-
-   default
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/files/, media-gfx/wings/

2016-10-17 Thread Jeroen Roovers
commit: dcdfe6d393e185ac1c0e6949d950c571eca62e7f
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Oct 17 13:47:41 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Oct 17 13:47:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcdfe6d3

media-gfx/wings: Version bump.

Package-Manager: portage-2.3.2

 media-gfx/wings/Manifest |  1 +
 media-gfx/wings/files/wings-2.1-wx.patch | 69 
 media-gfx/wings/wings-2.1.ebuild | 59 +++
 3 files changed, 129 insertions(+)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 051527c..38657d2 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,3 +1,4 @@
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 
1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 
e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 WHIRLPOOL 
9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
 DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 
fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f
 WHIRLPOOL 
1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
 DIST wings-2.0.5.tar.bz2 2455836 SHA256 
318b6f9479b04882f2307b60d78a0020d305ce66ee3293e22cc36bde2a7fe360 SHA512 
d116c4d23043f79f80ecb76c9a0d2d0dec12169fb382ca0fc84a78c462541072ec7820bfbbaadfae39aee2a07512f346b845d3f4c6e133f2d80b0d12b07907b1
 WHIRLPOOL 
51bc7cf6a9bbfa02e04adda8d132ba06df848b822d0836fb66c437571a72d6603adab483407d4c7e037523485f021d92d030f261fb4e614813540178a1bb
+DIST wings-2.1.tar.bz2 2647932 SHA256 
9a878a76f4003d8ea54b17ed492b7aad68b3f191169e4a140b9ff7d981927a34 SHA512 
92a8b7b749117f382add0c724aad1996dfd7b57034557e354d5ebf7f7d7355df84cb708e7decbeadb573d4bc93a1e3c39a7afbde0fe949f07c5016079c712313
 WHIRLPOOL 
1ba9c19a168ea5b3ecabc720b437cccf78015e42bb2bc81e5efd9f330dcbefa1544b8551b59553249202fb6b5bc4f0f05375d85341f6ec972fa3dbb9f7993142

diff --git a/media-gfx/wings/files/wings-2.1-wx.patch 
b/media-gfx/wings/files/wings-2.1-wx.patch
new file mode 100644
index ..b59449d
--- /dev/null
+++ b/media-gfx/wings/files/wings-2.1-wx.patch
@@ -0,0 +1,69 @@
+diff --git a/icons/Makefile b/icons/Makefile
+index 4e5a43d..8622b38 100644
+--- a/icons/Makefile
 b/icons/Makefile
+@@ -31,7 +31,7 @@ PS_ICONS=$(patsubst %,bluecube/%,$(notdir $(GEN_PS_ICONS)))
+ # 
+ # FLAGS
+ # 
+-ERL_FLAGS += 
++ERL_FLAGS += -pa ../ebin
+ ERL_COMPILE_FLAGS += -Werror +debug_info
+ 
+ # 
+diff --git a/icons/collect_bmp.erl b/icons/collect_bmp.erl
+index 073fe73..e29d232 100644
+--- a/icons/collect_bmp.erl
 b/icons/collect_bmp.erl
+@@ -13,23 +13,21 @@
+ 
+ -module(collect_bmp).
+ -export([start/0,start/1]).
+--import(lists, [reverse/1]).
++
++-include_lib("wings/e3d/e3d_image.hrl").
+ 
+ start() ->
+ start(["icons","wings_icon.bundle"]).
+ 
+ start(Args) ->
+-io:put_chars("Loading"),
+ do_start(Args, []).
+ 
+ do_start([InDir|[_|_]=T], Files) ->
+ do_start(T, add_files(InDir, Files));
+ do_start([OutFile], Files) ->
+-wx:new(),
+ Icons = load_icons(Files),
+-io:nl(),
+ Bin = term_to_binary(Icons, [compressed]),
+-io:format("Writing ~s\n", [OutFile]),
++%% io:format("Writing ~s\n", [OutFile]),
+ ok = file:write_file(OutFile, Bin).
+ 
+ add_files(Dir, Acc) ->
+@@ -42,14 +40,16 @@ load_icons([Name|Ns]) ->
+ load_icons([]) -> [].
+ 
+ load_icon(Name) ->
+-Image = wxImage:new(Name),
+-wxImage:ok(Image) orelse exit({failed_to_load, Name}),
+-W = wxImage:getWidth(Image),
+-H = wxImage:getHeight(Image),
+-RGB = wxImage:getData(Image),
+-case wxImage:hasAlpha(Image) of
+-  true ->  {4,W,H,RGB,wxImage:getAlpha(Image)};
+-  false -> {3,W,H,RGB, <<>>}
++case e3d_image:load(Name) of
++#e3d_image{bytes_pp=4, width=W, height=H} = I ->
++#e3d_image{image=RGB} = e3d_image:convert(I, r8g8b8, 1, 
upper_left),
++#e3d_image{image=Alpha} = e3d_image:convert(I, a8, 1, upper_left),
++{4,W,H,RGB,Alpha};
++#e3d_image{bytes_pp=3, width=W, height=H} = I ->
++#e3d_image{image=RGB} = e3d_image:convert(I, r8g8b8, 1, 
upper_left),
++{3,W,H,RGB,<<>>};
++_ ->
++exit({failed_to_load, Name})
+ end.
+ 
+ 

diff --git a/media-gfx/wings/wings-2.1.ebuild b/media-gfx/wings/wings-2.1.ebuild
new file mode 100644
index ..c441d9d
--- /dev/null
+++ b/media-gfx/wings/wings-2.1.ebuild
@@ -0,0 +1,59 @@

[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-08-29 Thread Jeroen Roovers
commit: 63d6138c4fb8584e82bad7e305dc5efcc5aa1dfc
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Aug 29 07:28:32 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Aug 29 07:28:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d6138c

media-gfx/wings: Old.

Package-Manager: portage-2.3.0

 media-gfx/wings/Manifest  |  1 -
 media-gfx/wings/wings-2.0.4-r4.ebuild | 55 ---
 2 files changed, 56 deletions(-)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 9ec62d8..051527c 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,4 +1,3 @@
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 
1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 
e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 WHIRLPOOL 
9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
 DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 
fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f
 WHIRLPOOL 
1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
-DIST wings-2.0.4.tar.bz2 2457543 SHA256 
4f76360766f0a76562e8d08d78702cfa3afe02e8e7287e0d518a9e7a743f35c4 SHA512 
237c409261580595056029cb18fad9d4703121ea489d8c4c901b3c47fe9e4badb0dbea9a0718c74c403139aabe74c948241f131c0d2d62f5fb2e01e7fcd7d40c
 WHIRLPOOL 
4827ef5ea6c68c0bd7df566cd6da5bf3e7029153eb648ab15f5e6327837adc90c36cd127c327f17325921844013989af13389e3a24c41d62709bc46330b5c832
 DIST wings-2.0.5.tar.bz2 2455836 SHA256 
318b6f9479b04882f2307b60d78a0020d305ce66ee3293e22cc36bde2a7fe360 SHA512 
d116c4d23043f79f80ecb76c9a0d2d0dec12169fb382ca0fc84a78c462541072ec7820bfbbaadfae39aee2a07512f346b845d3f4c6e133f2d80b0d12b07907b1
 WHIRLPOOL 
51bc7cf6a9bbfa02e04adda8d132ba06df848b822d0836fb66c437571a72d6603adab483407d4c7e037523485f021d92d030f261fb4e614813540178a1bb

diff --git a/media-gfx/wings/wings-2.0.4-r4.ebuild 
b/media-gfx/wings/wings-2.0.4-r4.ebuild
deleted file mode 100644
index 9b046f2..
--- a/media-gfx/wings/wings-2.0.4-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/;
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   >=dev-lang/erlang-18.1[smp,wxwidgets]
-   dev-libs/cl
-   media-libs/libsdl[opengl]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   sed -i \
-   -e '/include_lib/s|"wings/|"../|' \
-   $(find . -name '*'.erl) \
-   || die
-
-   eapply_user
-}
-
-src_configure() {
-   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
-   # Work around parallel make issues
-   emake vsn.mk
-   for subdir in intl_tools src e3d icons plugins_src; do
-   emake -C ${subdir}
-   done
-}
-
-src_install() {
-   WINGS_PATH=${ERL_PATH}/${P}
-   dodir ${WINGS_PATH}
-
-   find -name 'Makefile*' -exec rm -f '{}' \;
-
-   insinto ${WINGS_PATH}
-   doins -r e3d ebin icons plugins psd shaders src textures tools
-
-   newbin "${FILESDIR}"/wings.sh-r1 wings
-   dodoc AUTHORS README
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-07-04 Thread Jeroen Roovers
commit: f2fa8d0c7682f2b753560db0deef011bd37e87ea
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jul  4 07:13:52 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jul  4 07:18:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2fa8d0c

media-gfx/wings: Version bump.

Package-Manager: portage-2.3.0

 media-gfx/wings/Manifest   |  1 +
 media-gfx/wings/wings-2.0.5.ebuild | 55 ++
 2 files changed, 56 insertions(+)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 6387800..9ec62d8 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,3 +1,4 @@
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 
1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 
e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 WHIRLPOOL 
9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
 DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 
fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f
 WHIRLPOOL 
1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
 DIST wings-2.0.4.tar.bz2 2457543 SHA256 
4f76360766f0a76562e8d08d78702cfa3afe02e8e7287e0d518a9e7a743f35c4 SHA512 
237c409261580595056029cb18fad9d4703121ea489d8c4c901b3c47fe9e4badb0dbea9a0718c74c403139aabe74c948241f131c0d2d62f5fb2e01e7fcd7d40c
 WHIRLPOOL 
4827ef5ea6c68c0bd7df566cd6da5bf3e7029153eb648ab15f5e6327837adc90c36cd127c327f17325921844013989af13389e3a24c41d62709bc46330b5c832
+DIST wings-2.0.5.tar.bz2 2455836 SHA256 
318b6f9479b04882f2307b60d78a0020d305ce66ee3293e22cc36bde2a7fe360 SHA512 
d116c4d23043f79f80ecb76c9a0d2d0dec12169fb382ca0fc84a78c462541072ec7820bfbbaadfae39aee2a07512f346b845d3f4c6e133f2d80b0d12b07907b1
 WHIRLPOOL 
51bc7cf6a9bbfa02e04adda8d132ba06df848b822d0836fb66c437571a72d6603adab483407d4c7e037523485f021d92d030f261fb4e614813540178a1bb

diff --git a/media-gfx/wings/wings-2.0.5.ebuild 
b/media-gfx/wings/wings-2.0.5.ebuild
new file mode 100644
index 000..9b046f2
--- /dev/null
+++ b/media-gfx/wings/wings-2.0.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/;
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   >=dev-lang/erlang-18.1[smp,wxwidgets]
+   dev-libs/cl
+   media-libs/libsdl[opengl]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   sed -i \
+   -e '/include_lib/s|"wings/|"../|' \
+   $(find . -name '*'.erl) \
+   || die
+
+   eapply_user
+}
+
+src_configure() {
+   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+}
+
+src_compile() {
+   # Work around parallel make issues
+   emake vsn.mk
+   for subdir in intl_tools src e3d icons plugins_src; do
+   emake -C ${subdir}
+   done
+}
+
+src_install() {
+   WINGS_PATH=${ERL_PATH}/${P}
+   dodir ${WINGS_PATH}
+
+   find -name 'Makefile*' -exec rm -f '{}' \;
+
+   insinto ${WINGS_PATH}
+   doins -r e3d ebin icons plugins psd shaders src textures tools
+
+   newbin "${FILESDIR}"/wings.sh-r1 wings
+   dodoc AUTHORS README
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/files/, media-gfx/wings/

2016-07-02 Thread Jeroen Roovers
commit: 822eb3ec491e77960fa27f4495bc19677817b11c
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jul  2 11:27:49 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jul  2 11:27:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=822eb3ec

media-gfx/wings: Use sh instead of bash.

Package-Manager: portage-2.3.0

 media-gfx/wings/files/wings.sh   | 2 +-
 media-gfx/wings/files/wings.sh-r1| 2 +-
 media-gfx/wings/{wings-1.5.4-r1.ebuild => wings-1.5.4-r2.ebuild} | 0
 media-gfx/wings/{wings-2.0.4-r3.ebuild => wings-2.0.4-r4.ebuild} | 0
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/wings/files/wings.sh b/media-gfx/wings/files/wings.sh
index e542588..3fcebe4 100644
--- a/media-gfx/wings/files/wings.sh
+++ b/media-gfx/wings/files/wings.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ESDL_ROOT="/usr/lib/erlang/lib/esdl"
 WINGS_ROOT="/usr/lib/erlang/lib/wings"
 exec erl -smp disable -noshell -pa $ESDL_ROOT/ebin $WINGS_ROOT/ebin -run 
wings_start start_halt

diff --git a/media-gfx/wings/files/wings.sh-r1 
b/media-gfx/wings/files/wings.sh-r1
index 0816756..9cf1f26 100644
--- a/media-gfx/wings/files/wings.sh-r1
+++ b/media-gfx/wings/files/wings.sh-r1
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ESDL_ROOT="/usr/lib/erlang/lib/esdl"
 WINGS_ROOT="/usr/lib/erlang/lib/wings"
 exec erl -smp enable -noshell -pa $ESDL_ROOT/ebin $WINGS_ROOT/ebin -run 
wings_start start_halt

diff --git a/media-gfx/wings/wings-1.5.4-r1.ebuild 
b/media-gfx/wings/wings-1.5.4-r2.ebuild
similarity index 100%
rename from media-gfx/wings/wings-1.5.4-r1.ebuild
rename to media-gfx/wings/wings-1.5.4-r2.ebuild

diff --git a/media-gfx/wings/wings-2.0.4-r3.ebuild 
b/media-gfx/wings/wings-2.0.4-r4.ebuild
similarity index 100%
rename from media-gfx/wings/wings-2.0.4-r3.ebuild
rename to media-gfx/wings/wings-2.0.4-r4.ebuild



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-07-02 Thread Jeroen Roovers
commit: 4c797a42378b03c44d1a8d6684c25af3b330f5ef
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jul  2 11:06:10 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jul  2 11:08:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c797a42

media-gfx/wings: Fix include_lib (bug #585654) in 1.5.4.

 media-gfx/wings/wings-1.5.4-r1.ebuild | 9 +
 1 file changed, 9 insertions(+)

diff --git a/media-gfx/wings/wings-1.5.4-r1.ebuild 
b/media-gfx/wings/wings-1.5.4-r1.ebuild
index 3524eb8..87e60be 100644
--- a/media-gfx/wings/wings-1.5.4-r1.ebuild
+++ b/media-gfx/wings/wings-1.5.4-r1.ebuild
@@ -21,6 +21,15 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+   sed -i \
+   -e '/include_lib/s|"wings/|"../|' \
+   $(find . -name '*'.erl) \
+   || die
+
+   eapply_user
+}
+
 src_configure() {
export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
export ESDL_PATH="${ERL_PATH}/$(best_version media-libs/esdl | cut -d/ 
-f2)"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-06-14 Thread Tobias Klausmann
commit: 194b63a44c70938b29c1d157439feeaa33b3494a
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Jun 14 13:46:32 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Jun 14 13:47:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=194b63a4

media-gfx/wings: Drop alpha keyword

!!! All ebuilds that could satisfy 
">=media-libs/mesa-9.1.6[opencl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]"
 have been masked.
!!! One of the following masked packages is required to complete your request:
- media-libs/mesa-::gentoo (masked by: missing keyword)

(dependency required by "virtual/opencl-0-r4::gentoo" [ebuild])
(dependency required by "dev-libs/cl-1.2.1-r1::gentoo" [ebuild])
(dependency required by "=dev-libs/cl-1.2.1-r1" [argument])

This is a result of:

RDEPEND="app-eselect/eselect-opencl
|| (
>=media-libs/mesa-9.1.6[opencl,${MULTILIB_USEDEP}]
video_cards_fglrx? (
>=x11-drivers/ati-drivers-12.1-r1 )
video_cards_nvidia? (
>=x11-drivers/nvidia-drivers-290.10-r2 )
abi_x86_64? ( !abi_x86_32? ( dev-util/intel-ocl-sdk ) )
)"

This is just not satisfiable on Alpha at the moment. Also, wings has never been
stable on alpha (and is a bit niche), so I'll drop the alpha keyword for 1.1.1
and opt Alpha out.

Gentoo-Bug: 585588

Package-Manager: portage-2.3.0_rc1

 media-gfx/wings/wings-1.1.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/wings/wings-1.1.1.ebuild 
b/media-gfx/wings/wings-1.1.1.ebuild
index 2e0636a..c20aff9 100644
--- a/media-gfx/wings/wings-1.1.1.ebuild
+++ b/media-gfx/wings/wings-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/erlang-13.0



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-06-12 Thread Jeroen Roovers
commit: bffe5935f631c3385913324239618b57b9cb13b2
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun 12 09:15:32 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun 12 09:15:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bffe5935

media-gfx/wings: Drop esdl/wings symlinks (bug #585664).

Package-Manager: portage-2.3.0_rc1

 media-gfx/wings/{wings-1.5.4.ebuild => wings-1.5.4-r1.ebuild}| 2 --
 media-gfx/wings/{wings-2.0.4-r2.ebuild => wings-2.0.4-r3.ebuild} | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-gfx/wings/wings-1.5.4.ebuild 
b/media-gfx/wings/wings-1.5.4-r1.ebuild
similarity index 93%
rename from media-gfx/wings/wings-1.5.4.ebuild
rename to media-gfx/wings/wings-1.5.4-r1.ebuild
index e1b9202..3524eb8 100644
--- a/media-gfx/wings/wings-1.5.4.ebuild
+++ b/media-gfx/wings/wings-1.5.4-r1.ebuild
@@ -43,8 +43,6 @@ src_install() {
insinto ${WINGS_PATH}
doins -r e3d ebin fonts icons plugins psd shaders src textures tools
 
-   dosym ${WINGS_PATH} ${ERL_PATH}/${PN}
-   dosym ${ESDL_PATH} ${ERL_PATH}/esdl
newbin "${FILESDIR}"/wings.sh wings
dodoc AUTHORS README
 }

diff --git a/media-gfx/wings/wings-2.0.4-r2.ebuild 
b/media-gfx/wings/wings-2.0.4-r3.ebuild
similarity index 92%
rename from media-gfx/wings/wings-2.0.4-r2.ebuild
rename to media-gfx/wings/wings-2.0.4-r3.ebuild
index 2c45fe6..9b046f2 100644
--- a/media-gfx/wings/wings-2.0.4-r2.ebuild
+++ b/media-gfx/wings/wings-2.0.4-r3.ebuild
@@ -37,7 +37,7 @@ src_compile() {
# Work around parallel make issues
emake vsn.mk
for subdir in intl_tools src e3d icons plugins_src; do
-   emake ESDL_PATH="${ESDL_PATH}" -C ${subdir}
+   emake -C ${subdir}
done
 }
 
@@ -50,7 +50,6 @@ src_install() {
insinto ${WINGS_PATH}
doins -r e3d ebin icons plugins psd shaders src textures tools
 
-   dosym ${WINGS_PATH} ${ERL_PATH}/${PN}
newbin "${FILESDIR}"/wings.sh-r1 wings
dodoc AUTHORS README
 }



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-06-12 Thread Jeroen Roovers
commit: d461f5f8b3d11759da91d5924f5ddecf3f82
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun 12 09:06:49 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun 12 09:07:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d461f5f8

media-gfx/wings: Drop esdl symlink (bug #585664).

Package-Manager: portage-2.3.0_rc1

 media-gfx/wings/{wings-2.0.4-r1.ebuild => wings-2.0.4-r2.ebuild} | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-gfx/wings/wings-2.0.4-r1.ebuild 
b/media-gfx/wings/wings-2.0.4-r2.ebuild
similarity index 90%
rename from media-gfx/wings/wings-2.0.4-r1.ebuild
rename to media-gfx/wings/wings-2.0.4-r2.ebuild
index a2736e5..2c45fe6 100644
--- a/media-gfx/wings/wings-2.0.4-r1.ebuild
+++ b/media-gfx/wings/wings-2.0.4-r2.ebuild
@@ -31,7 +31,6 @@ src_prepare() {
 
 src_configure() {
export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-   export ESDL_PATH="${ERL_PATH}/$(best_version media-libs/esdl | cut -d/ 
-f2)"
 }
 
 src_compile() {
@@ -52,7 +51,6 @@ src_install() {
doins -r e3d ebin icons plugins psd shaders src textures tools
 
dosym ${WINGS_PATH} ${ERL_PATH}/${PN}
-   dosym ${ESDL_PATH} ${ERL_PATH}/esdl
newbin "${FILESDIR}"/wings.sh-r1 wings
dodoc AUTHORS README
 }



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/, media-gfx/wings/files/

2016-06-12 Thread Jeroen Roovers
commit: 26c46c964e60fc951fb91ca24db2a3b2f2636fb1
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun 12 08:55:52 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun 12 08:55:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c46c96

media-gfx/wings: Fix include_lib everywhere (bug #585654).

Package-Manager: portage-2.3.0_rc1

 media-gfx/wings/files/wings-2.0.4-wx.patch| 10 --
 media-gfx/wings/files/wings.sh-r1 |  4 
 .../{wings-2.0.4.ebuild => wings-2.0.4-r1.ebuild} | 19 ---
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/media-gfx/wings/files/wings-2.0.4-wx.patch 
b/media-gfx/wings/files/wings-2.0.4-wx.patch
deleted file mode 100644
index a50f3d5..000
--- a/media-gfx/wings/files/wings-2.0.4-wx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/plugins_src/primitives/wpc_tt.erl
-+++ b/plugins_src/primitives/wpc_tt.erl
-@@ -21,6 +21,7 @@
- 
- -include_lib("wings/src/wings.hrl").
- -include_lib("wings/e3d/e3d.hrl").
-+-include_lib("wx/include/wx.hrl").
- 
- -record(ttfont,
-   {nglyph,% number of glyphs

diff --git a/media-gfx/wings/files/wings.sh-r1 
b/media-gfx/wings/files/wings.sh-r1
new file mode 100644
index 000..0816756
--- /dev/null
+++ b/media-gfx/wings/files/wings.sh-r1
@@ -0,0 +1,4 @@
+#!/bin/bash
+ESDL_ROOT="/usr/lib/erlang/lib/esdl"
+WINGS_ROOT="/usr/lib/erlang/lib/wings"
+exec erl -smp enable -noshell -pa $ESDL_ROOT/ebin $WINGS_ROOT/ebin -run 
wings_start start_halt

diff --git a/media-gfx/wings/wings-2.0.4.ebuild 
b/media-gfx/wings/wings-2.0.4-r1.ebuild
similarity index 73%
rename from media-gfx/wings/wings-2.0.4.ebuild
rename to media-gfx/wings/wings-2.0.4-r1.ebuild
index e295638..a2736e5 100644
--- a/media-gfx/wings/wings-2.0.4.ebuild
+++ b/media-gfx/wings/wings-2.0.4-r1.ebuild
@@ -14,27 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-   >=dev-lang/erlang-18.1[wxwidgets]
+   >=dev-lang/erlang-18.1[smp,wxwidgets]
dev-libs/cl
media-libs/libsdl[opengl]
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.0.4-wx.patch
-)
-
 src_prepare() {
-   default
-
sed -i \
-   -e '/include_lib/s|wings/|../|' \
-   plugins_src/primitives/wpc_knot.erl \
-   plugins_src/primitives/wpc_plane.erl \
-   plugins_src/primitives/wpc_spiral.erl \
-   plugins_src/primitives/wpc_torus.erl \
-   plugins_src/wp9_dialogs.erl \
-   src/wings_text.erl \
+   -e '/include_lib/s|"wings/|"../|' \
+   $(find . -name '*'.erl) \
|| die
 
eapply_user
@@ -64,6 +53,6 @@ src_install() {
 
dosym ${WINGS_PATH} ${ERL_PATH}/${PN}
dosym ${ESDL_PATH} ${ERL_PATH}/esdl
-   newbin "${FILESDIR}"/wings.sh wings
+   newbin "${FILESDIR}"/wings.sh-r1 wings
dodoc AUTHORS README
 }



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/files/, media-gfx/wings/

2016-06-12 Thread Jeroen Roovers
commit: ea8a91afdf24a71f531ac482560e04569c6ee2b9
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun 12 08:37:04 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun 12 08:37:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea8a91af

media-gfx/wings: Fix include_lib (wx) (bug #585654).

Package-Manager: portage-2.3.0_rc1

 media-gfx/wings/files/wings-2.0.4-wx.patch | 10 ++
 media-gfx/wings/wings-2.0.4.ebuild |  8 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/media-gfx/wings/files/wings-2.0.4-wx.patch 
b/media-gfx/wings/files/wings-2.0.4-wx.patch
new file mode 100644
index 000..a50f3d5
--- /dev/null
+++ b/media-gfx/wings/files/wings-2.0.4-wx.patch
@@ -0,0 +1,10 @@
+--- a/plugins_src/primitives/wpc_tt.erl
 b/plugins_src/primitives/wpc_tt.erl
+@@ -21,6 +21,7 @@
+ 
+ -include_lib("wings/src/wings.hrl").
+ -include_lib("wings/e3d/e3d.hrl").
++-include_lib("wx/include/wx.hrl").
+ 
+ -record(ttfont,
+   {nglyph,% number of glyphs

diff --git a/media-gfx/wings/wings-2.0.4.ebuild 
b/media-gfx/wings/wings-2.0.4.ebuild
index 67b2700..e295638 100644
--- a/media-gfx/wings/wings-2.0.4.ebuild
+++ b/media-gfx/wings/wings-2.0.4.ebuild
@@ -20,7 +20,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.0.4-wx.patch
+)
+
 src_prepare() {
+   default
+
sed -i \
-e '/include_lib/s|wings/|../|' \
plugins_src/primitives/wpc_knot.erl \
@@ -54,7 +60,7 @@ src_install() {
find -name 'Makefile*' -exec rm -f '{}' \;
 
insinto ${WINGS_PATH}
-   doins -r e3d ebin fonts icons plugins psd shaders src textures tools
+   doins -r e3d ebin icons plugins psd shaders src textures tools
 
dosym ${WINGS_PATH} ${ERL_PATH}/${PN}
dosym ${ESDL_PATH} ${ERL_PATH}/esdl



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-06-12 Thread Jeroen Roovers
commit: ab143f0303c6f4f1201a47171032755d6f3b11b7
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun 12 07:42:59 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun 12 07:53:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab143f03

media-gfx/wings: Fix include_lib (bug #585654).

Package-Manager: portage-2.3.0_rc1

 media-gfx/wings/wings-2.0.4.ebuild | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/media-gfx/wings/wings-2.0.4.ebuild 
b/media-gfx/wings/wings-2.0.4.ebuild
index 9d7fc67..67b2700 100644
--- a/media-gfx/wings/wings-2.0.4.ebuild
+++ b/media-gfx/wings/wings-2.0.4.ebuild
@@ -20,6 +20,20 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+   sed -i \
+   -e '/include_lib/s|wings/|../|' \
+   plugins_src/primitives/wpc_knot.erl \
+   plugins_src/primitives/wpc_plane.erl \
+   plugins_src/primitives/wpc_spiral.erl \
+   plugins_src/primitives/wpc_torus.erl \
+   plugins_src/wp9_dialogs.erl \
+   src/wings_text.erl \
+   || die
+
+   eapply_user
+}
+
 src_configure() {
export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
export ESDL_PATH="${ERL_PATH}/$(best_version media-libs/esdl | cut -d/ 
-f2)"
@@ -28,7 +42,7 @@ src_configure() {
 src_compile() {
# Work around parallel make issues
emake vsn.mk
-   for subdir in intl_tools src fonts_src e3d icons plugins_src; do
+   for subdir in intl_tools src e3d icons plugins_src; do
emake ESDL_PATH="${ESDL_PATH}" -C ${subdir}
done
 }



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-06-11 Thread Jeroen Roovers
commit: bb9149db08b880703c2bc7c0263cd85f66f65626
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jun 11 10:44:02 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jun 11 10:44:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb9149db

media-gfx/wings: Version bump. Remove testing cruft.

Package-Manager: portage-2.3.0_rc1

 media-gfx/wings/Manifest   | 1 +
 media-gfx/wings/wings-1.5.4.ebuild | 2 --
 media-gfx/wings/{wings-1.5.4.ebuild => wings-2.0.4.ebuild} | 5 +
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 4dd2826..6387800 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,2 +1,3 @@
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 
1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 
e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 WHIRLPOOL 
9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
 DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 
fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f
 WHIRLPOOL 
1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
+DIST wings-2.0.4.tar.bz2 2457543 SHA256 
4f76360766f0a76562e8d08d78702cfa3afe02e8e7287e0d518a9e7a743f35c4 SHA512 
237c409261580595056029cb18fad9d4703121ea489d8c4c901b3c47fe9e4badb0dbea9a0718c74c403139aabe74c948241f131c0d2d62f5fb2e01e7fcd7d40c
 WHIRLPOOL 
4827ef5ea6c68c0bd7df566cd6da5bf3e7029153eb648ab15f5e6327837adc90c36cd127c327f17325921844013989af13389e3a24c41d62709bc46330b5c832

diff --git a/media-gfx/wings/wings-1.5.4.ebuild 
b/media-gfx/wings/wings-1.5.4.ebuild
index 418f53d..e1b9202 100644
--- a/media-gfx/wings/wings-1.5.4.ebuild
+++ b/media-gfx/wings/wings-1.5.4.ebuild
@@ -24,8 +24,6 @@ DEPEND="${RDEPEND}"
 src_configure() {
export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
export ESDL_PATH="${ERL_PATH}/$(best_version media-libs/esdl | cut -d/ 
-f2)"
-   echo $ERL_PATH
-   echo $ESDL_PATH
 }
 
 src_compile() {

diff --git a/media-gfx/wings/wings-1.5.4.ebuild 
b/media-gfx/wings/wings-2.0.4.ebuild
similarity index 92%
copy from media-gfx/wings/wings-1.5.4.ebuild
copy to media-gfx/wings/wings-2.0.4.ebuild
index 418f53d..01fc87e 100644
--- a/media-gfx/wings/wings-1.5.4.ebuild
+++ b/media-gfx/wings/wings-2.0.4.ebuild
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-   >=dev-lang/erlang-17.0[wxwidgets]
-   >=media-libs/esdl-1.0.1
+   >=dev-lang/erlang-18.0[wxwidgets]
dev-libs/cl
media-libs/libsdl[opengl]
 "
@@ -24,8 +23,6 @@ DEPEND="${RDEPEND}"
 src_configure() {
export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
export ESDL_PATH="${ERL_PATH}/$(best_version media-libs/esdl | cut -d/ 
-f2)"
-   echo $ERL_PATH
-   echo $ESDL_PATH
 }
 
 src_compile() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-06-11 Thread Jeroen Roovers
commit: ea5f1c6e61be332c6210dd695a40e2cce0c15e5e
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jun 11 10:45:02 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jun 11 10:45:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5f1c6e

media-gfx/wings: Version bump. Fix minimum dev-lang/erlang version for 2.0.4.

Package-Manager: portage-2.3.0_rc1

 media-gfx/wings/wings-2.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/wings/wings-2.0.4.ebuild 
b/media-gfx/wings/wings-2.0.4.ebuild
index 01fc87e..9d7fc67 100644
--- a/media-gfx/wings/wings-2.0.4.ebuild
+++ b/media-gfx/wings/wings-2.0.4.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-   >=dev-lang/erlang-18.0[wxwidgets]
+   >=dev-lang/erlang-18.1[wxwidgets]
dev-libs/cl
media-libs/libsdl[opengl]
 "



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-06-11 Thread Jeroen Roovers
commit: ba0bd9501dad6881b7c15381d4119de89490f253
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jun 11 10:08:12 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jun 11 10:09:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0bd950

media-gfx/wings: Maintain.

Package-Manager: portage-2.3.0_rc1

 media-gfx/wings/wings-1.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/wings/wings-1.5.4.ebuild 
b/media-gfx/wings/wings-1.5.4.ebuild
index b0c2d09..418f53d 100644
--- a/media-gfx/wings/wings-1.5.4.ebuild
+++ b/media-gfx/wings/wings-1.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
>=dev-lang/erlang-17.0[wxwidgets]



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-06-11 Thread Jeroen Roovers
commit: 2d1e4627f6b21b1c7ca3f6ca8af14a7f7fb113ff
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jun 11 10:05:00 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jun 11 10:09:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1e4627

media-gfx/wings: Maintain.

Package-Manager: portage-2.3.0_rc1

 media-gfx/wings/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-gfx/wings/metadata.xml b/media-gfx/wings/metadata.xml
index aa9bb9c..5c5921b 100644
--- a/media-gfx/wings/metadata.xml
+++ b/media-gfx/wings/metadata.xml
@@ -5,6 +5,9 @@
graph...@gentoo.org
Gentoo Graphics Project

+   
+   j...@gentoo.org
+   

 Wings 3D is a polygon mesh modeler inspired by Nendo and 
 Mirai from Izware.



[gentoo-commits] repo/gentoo:master commit in: media-gfx/wings/

2016-06-11 Thread Jeroen Roovers
commit: 438f44d732879ee8978eb6a171a4b6e7e89b307c
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jun 11 10:02:36 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jun 11 10:09:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438f44d7

media-gfx/wings: Version bump (bug #383239 by Jacek Szafarkiewicz).

Package-Manager: portage-2.3.0_rc1

 media-gfx/wings/Manifest   |  1 +
 media-gfx/wings/wings-1.5.4.ebuild | 52 ++
 2 files changed, 53 insertions(+)

diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 1a0dcc0..4dd2826 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1 +1,2 @@
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 
1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 
e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3
 WHIRLPOOL 
9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
+DIST wings-1.5.4.tar.bz2 6213585 SHA256 
bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 
fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f
 WHIRLPOOL 
1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4

diff --git a/media-gfx/wings/wings-1.5.4.ebuild 
b/media-gfx/wings/wings-1.5.4.ebuild
new file mode 100644
index 000..b0c2d09
--- /dev/null
+++ b/media-gfx/wings/wings-1.5.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/;
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+   >=dev-lang/erlang-17.0[wxwidgets]
+   >=media-libs/esdl-1.0.1
+   dev-libs/cl
+   media-libs/libsdl[opengl]
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+   export ESDL_PATH="${ERL_PATH}/$(best_version media-libs/esdl | cut -d/ 
-f2)"
+   echo $ERL_PATH
+   echo $ESDL_PATH
+}
+
+src_compile() {
+   # Work around parallel make issues
+   emake vsn.mk
+   for subdir in intl_tools src fonts_src e3d icons plugins_src; do
+   emake ESDL_PATH="${ESDL_PATH}" -C ${subdir}
+   done
+}
+
+src_install() {
+   WINGS_PATH=${ERL_PATH}/${P}
+   dodir ${WINGS_PATH}
+
+   find -name 'Makefile*' -exec rm -f '{}' \;
+
+   insinto ${WINGS_PATH}
+   doins -r e3d ebin fonts icons plugins psd shaders src textures tools
+
+   dosym ${WINGS_PATH} ${ERL_PATH}/${PN}
+   dosym ${ESDL_PATH} ${ERL_PATH}/esdl
+   newbin "${FILESDIR}"/wings.sh wings
+   dodoc AUTHORS README
+}