From 26e63a2522c5443dd02a7278c98b8b73a98193ca Mon Sep 17 00:00:00 2001 From: Anthoine Bourgeois Date: Wed, 1 Feb 2012 14:10:43 +0100 Subject: Move libspnav from media-libs to dev-libs category --- dev-libs/libspnav/Manifest | 5 ++ .../files/libspnav-0.2.2-custom-flags.patch | 75 ++++++++++++++++++++++ .../libspnav/files/libspnav-0.2.2-makefile.patch | 27 ++++++++ dev-libs/libspnav/libspnav-0.2.2.ebuild | 48 ++++++++++++++ dev-libs/libspnav/metadata.xml | 22 +++++++ media-gfx/blender/Manifest | 12 ++-- media-gfx/blender/blender-2.60a.ebuild | 2 +- media-gfx/blender/blender-2.61-r1.ebuild | 2 +- media-gfx/blender/blender-2.61-r2.ebuild | 2 +- media-gfx/blender/blender-2.61-r3.ebuild | 2 +- media-gfx/blender/blender-2.61-r4.ebuild | 2 +- media-gfx/blender/blender-2.61.ebuild | 2 +- media-libs/libspnav/Manifest | 5 -- .../files/libspnav-0.2.2-custom-flags.patch | 75 ---------------------- .../libspnav/files/libspnav-0.2.2-makefile.patch | 27 -------- media-libs/libspnav/libspnav-0.2.2.ebuild | 48 -------------- media-libs/libspnav/metadata.xml | 22 ------- 17 files changed, 189 insertions(+), 189 deletions(-) create mode 100644 dev-libs/libspnav/Manifest create mode 100644 dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch create mode 100644 dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch create mode 100644 dev-libs/libspnav/libspnav-0.2.2.ebuild create mode 100644 dev-libs/libspnav/metadata.xml delete mode 100644 media-libs/libspnav/Manifest delete mode 100644 media-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch delete mode 100644 media-libs/libspnav/files/libspnav-0.2.2-makefile.patch delete mode 100644 media-libs/libspnav/libspnav-0.2.2.ebuild delete mode 100644 media-libs/libspnav/metadata.xml diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest new file mode 100644 index 0000000..e67c697 --- /dev/null +++ b/dev-libs/libspnav/Manifest @@ -0,0 +1,5 @@ +AUX libspnav-0.2.2-custom-flags.patch 2151 RMD160 26eccbf34e404defe392333db30f433737220bc6 SHA1 e14d386825db1728261cfb9fbef2e5fd4c480383 SHA256 f3dcc7b4023e67a87a0554cdd277a836696c948b0ec01035ec6fe5dd2e4c587b +AUX libspnav-0.2.2-makefile.patch 926 RMD160 7bee7c9d4af64bdafa3178c1565a41f062a96359 SHA1 9c20ac0d0d5c2bb8f60270b0d630bb37594a0596 SHA256 ec3abb5c566b3b4bb3f18e58ff83802845ea9156cba42ed417f4da35733746e7 +DIST libspnav-0.2.2.tar.gz 11615 RMD160 d49a1c9b5e556fd8ff8e7545d0983c1b205fe9f2 SHA1 c9291ed4acb38da3be4f81e6e3b43f853ce55eca SHA256 fb72388770d7dcd85b56ac2a83948983f1afd7dbe271e18d507b975ac4bea14f +EBUILD libspnav-0.2.2.ebuild 1137 RMD160 2eb6836d930dbf9914917397378f09b14f1b921a SHA1 e60621dc9b1c668b9f9ac44d0b544e050ba59e83 SHA256 53cda83930da437ad35816c5d871d5ccdda68ff1977fde830e38d6098fdeb3ec +MISC metadata.xml 850 RMD160 ac6b9735dafead0ee2569e89dfad1e2724d69be4 SHA1 b2d86473d5a5f83a72769f9305bf23fbd494eaff SHA256 18379cae8775245952a6107dc6f447b9ab511e58b87a1299d72ada53f1498bf6 diff --git a/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch b/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch new file mode 100644 index 0000000..cc96655 --- /dev/null +++ b/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch @@ -0,0 +1,75 @@ +diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in +--- libspnav-0.2.2.orig/Makefile.in 2012-01-31 22:34:01.448356249 +0100 ++++ libspnav-0.2.2/Makefile.in 2012-01-31 22:39:20.229350669 +0100 +@@ -7,7 +7,8 @@ lib_so = $(soname).1 + + CC = gcc + AR = ar +-CFLAGS = $(opt) $(dbg) -std=c89 -fpic -pedantic -Wall -fno-strict-aliasing -I. ++CFLAGS = $(opt) -fpic -I. ++LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname) + + .PHONY: all + all: $(lib_a) $(lib_so) +@@ -16,7 +17,7 @@ $(lib_a): $(obj) + $(AR) rcs $@ $(obj) + + $(lib_so): $(obj) +- $(CC) -shared -Wl,-soname,$(soname) -o $@ $(obj) ++ $(CC) $(LDFLAGS) -o $@ $(obj) + + %.o: $(srcdir)/%.c + $(CC) $(CFLAGS) -c $< -o $@ +diff -Npur libspnav-0.2.2.orig/configure libspnav-0.2.2/configure +--- libspnav-0.2.2.orig/configure 2012-01-31 22:34:01.448356249 +0100 ++++ libspnav-0.2.2/configure 2012-01-31 22:34:39.703355615 +0100 +@@ -4,6 +4,7 @@ echo 'configuring spacenav library...' + + PREFIX=/usr/local + OPT=yes ++LDOPT=yes + DBG=yes + X11=yes + +@@ -26,6 +27,11 @@ for arg; do + --disable-opt) + OPT=no;; + ++ --enable-ldopt) ++ LDOPT=yes;; ++ --disable-ldopt) ++ LDOPT=no;; ++ + --enable-debug) + DBG=yes;; + --disable-debug) +@@ -44,6 +50,8 @@ for arg; do + echo ' --disable-x11: disable X11 communication mode' + echo ' --enable-opt: enable speed optimizations (default)' + echo ' --disable-opt: disable speed optimizations' ++ echo ' --enable-ldopt: enable link optimizations (default)' ++ echo ' --disable-ldopt: disable link optimizations' + echo ' --enable-debug: include debugging symbols (default)' + echo ' --disable-debug: do not include debugging symbols' + echo 'all invalid options are silently ignored' +@@ -54,6 +62,7 @@ done + + echo " prefix: $PREFIX" + echo " optimize for speed: $OPT" ++echo " optimize link: $LDOPT" + echo " include debugging symbols: $DBG" + echo " x11 communication method: $X11" + echo "" +@@ -74,7 +83,11 @@ if [ "$DBG" = 'yes' ]; then + fi + + if [ "$OPT" = 'yes' ]; then +- echo 'opt = -O3' >>Makefile ++ echo "opt = ${CFLAGS:--O3}" >>Makefile ++fi ++ ++if [ "$LDOPT" = 'yes' ]; then ++ echo "ldopt = ${LDFLAGS}" >>Makefile + fi + + if [ "$X11" = 'yes' ]; then diff --git a/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch b/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch new file mode 100644 index 0000000..f65300c --- /dev/null +++ b/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch @@ -0,0 +1,27 @@ +diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in +--- libspnav-0.2.2.orig/Makefile.in 2012-01-31 22:40:36.619349333 +0100 ++++ libspnav-0.2.2/Makefile.in 2012-01-31 22:41:52.554347975 +0100 +@@ -11,7 +11,7 @@ CFLAGS = $(opt) -I. + LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname) + + .PHONY: all +-all: $(lib_a) $(lib_so) ++all: $(lib_so) + + $(lib_a): $(obj) + $(AR) rcs $@ $(obj) +@@ -31,10 +31,10 @@ distclean: + rm -f $(obj) $(lib_a) $(lib_so) Makefile + + .PHONY: install +-install: $(lib_a) $(lib_so) +- cp $(lib_a) $(PREFIX)/$(libdir)/$(lib_a) +- cp $(lib_so) $(PREFIX)/$(libdir)/$(lib_so) +- for h in $(hdr); do cp -p $(srcdir)/$$h $(PREFIX)/include/; done ++install: $(lib_so) ++ mkdir -p $(DESTDIR)$(PREFIX)/$(libdir) $(DESTDIR)$(PREFIX)/include ++ cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) ++ for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done + + .PHONY: uninstall + uninstall: diff --git a/dev-libs/libspnav/libspnav-0.2.2.ebuild b/dev-libs/libspnav/libspnav-0.2.2.ebuild new file mode 100644 index 0000000..10b7c97 --- /dev/null +++ b/dev-libs/libspnav/libspnav-0.2.2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" + +inherit multilib eutils toolchain-funcs + +MY_PN='spacenav' +DESCRIPTION="The libspnav provides a replacement of the magellan library with cleaner and more orthogonal API." +HOMEPAGE="http://spacenav.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X" + +RDEPEND="X? ( app-misc/spacenavd[X?] )" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-makefile.patch + epatch "${FILESDIR}"/${P}-custom-flags.patch +} + +src_configure() { + econf \ + --enable-opt --enable-ldopt \ + $(use_enable X x11) +} + +src_compile() { + emake CC=$(tc-getCC) +} + +src_install() { + default + + # Use proper libdir + if [[ $(get_libdir) != lib ]]; then + mv "${D}"/usr/{lib,$(get_libdir)} || die + fi + + # Create missing symlinks + local target=$(basename "${D}"/usr/$(get_libdir)/libspnav.so.*) + dosym ${target} /usr/$(get_libdir)/libspnav.so.0 || die + dosym ${target} /usr/$(get_libdir)/libspnav.so || die +} diff --git a/dev-libs/libspnav/metadata.xml b/dev-libs/libspnav/metadata.xml new file mode 100644 index 0000000..6de51ea --- /dev/null +++ b/dev-libs/libspnav/metadata.xml @@ -0,0 +1,22 @@ + + + + no-herd + + anthoine.bourgeois@gmail.com + Anthoine Bourgeois + + + sping@gentoo.org + Sebastian Pipping + + + The libspnav library is provided as a replacement of the magellan + library. It provides a cleaner, and more orthogonal interface. libspnav + supports both the original X11 protocol for communicating with the + driver, and the new alternative non-X protocol. Programs that choose to + use the X11 protocol, are automatically compatible with either the free + spacenavd driver or the official 3dxserv, as if they were using the + magellan SDK. + + diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 36105da..f2904dd 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -25,10 +25,10 @@ AUX blender-2.61-insecure.desktop 596 RMD160 7fa4487d101479c5efcc83eddc23efe6dac AUX blender-desktop.patch 641 RMD160 5be612d2836005e51e1bcfed10959e75315f201f SHA1 b0f99cdefc6c1a21b32ea97a237e214b22e5f9e6 SHA256 f52bc6f42eb07e693bfbe578747cf126b242b04273cbcd78a8ee4879eae8b514 DIST blender-2.60a.tar.gz 25679123 RMD160 74434c4e748872322386971cf6021255b0bfa1c8 SHA1 f23551e6ed661626c61de4a758d9ff67e0f27529 SHA256 7d788599ab46dac37f630dec026d06f7e3d73508f243eeb4ade8bcdcb661f124 DIST blender-2.61.tar.gz 25087312 RMD160 fb3b368144d31cd850a0602b7b5e746fca17d7fc SHA1 1b0d008e8022cb29efc9b4a337379eeb93bdcbb7 SHA256 58563583c8775fa0f746a7f4899b1619fec3df69accfa536544fdcbf372685f1 -EBUILD blender-2.60a.ebuild 13760 RMD160 bc4458ccf226e20c140ed022325c35bda09a1add SHA1 95a5894363e730db0a66a16f9e8fcb775ea6896a SHA256 146e61d01da115d202f5c77b17ae938a4c2e92344b71b5422bcf6165d4d71d29 -EBUILD blender-2.61-r1.ebuild 12982 RMD160 a4c10e2cde47bc97742e3efbbff2fbe0839bf1be SHA1 5492736f268813bf11841ae44cfcc3ba655ba04e SHA256 90d8e092d353ff35d8966ed4e3dc01d6514fc5dc41850ea5cd72c2f0e88bd215 -EBUILD blender-2.61-r2.ebuild 12243 RMD160 088c95922bc6d4ab8242fba88aae562c5e40369b SHA1 b12e3f8a164bcf08a4f01370371bca61a0907653 SHA256 06853bb84b49eb7e725875635c1ef1ed1ca4465442a6a001163ec60ee8a4929c -EBUILD blender-2.61-r3.ebuild 13127 RMD160 7517357f9eeb20d741e9e689c98b9ea588a0d8b3 SHA1 1e3d01bf86ee13e9ec2b95848e5668fbe2dfc7bb SHA256 e166622430e74df56dbaae0017fac729a5d9dd99e944256e42b09047d56dd17a -EBUILD blender-2.61-r4.ebuild 13146 RMD160 ee53041ec9797ddbe0327839c82cb7964d9a91f3 SHA1 dd7f36a00b2c93c170fc1e809adb96a65be6f8e4 SHA256 a81bcb5a0f8b2940e111de6901e8e1a5b31d22b5fa672c0befd0c27ab0578c79 -EBUILD blender-2.61.ebuild 13767 RMD160 dfe843c6b2cff607f1215faea2eb805d03d689a7 SHA1 8b43d751d3c2b0d1c0dad0d47c0cdb202674b65b SHA256 0e4929b08a6e1da7c46ff57b12aa27c21c2f7071933d7b2002d26d15407511d8 +EBUILD blender-2.60a.ebuild 13758 RMD160 1d9cb5abdcc1759472279364dcc013d496cad75f SHA1 3c1103e7212dc61169411a46f5b74377b744f352 SHA256 8046fa06274b9299711717cc936ede7bf9209e532cad1a969a89888a1a9c85d5 +EBUILD blender-2.61-r1.ebuild 12980 RMD160 7091e4afa22d95a9b987d4bc71553a1476727117 SHA1 d6bc4a0f3621dd23a490df389ce97652cc5719e2 SHA256 f5f53b533913fa391b393d51b2b27d073c51abf8ef7c5e700a9a4a7fe50a07be +EBUILD blender-2.61-r2.ebuild 12241 RMD160 2a144de5c5f8d8d932ad557e60011779124e9d8c SHA1 bbc7e9a3ae37c3f433ae036806469a95b47154cc SHA256 09c29d5f6058b98735068c00e9e9f1d8285b7f4d40cddcbae1cf67e1fdf8311c +EBUILD blender-2.61-r3.ebuild 13125 RMD160 533c391781524dd3969ac49cab7b905810a866f1 SHA1 46326c1d1e43d568a51ac3ed19563ecfe2560800 SHA256 7fcdacc128aa3619f84c37b23d747cc72f797f94c416a7000f64137b56ed55ba +EBUILD blender-2.61-r4.ebuild 13144 RMD160 19376c7c8b54d9ee5a23a3c8d01f3e0c3a73e9fd SHA1 a38dd22149ba3ea6205133fc0640906bf9f7cce9 SHA256 72e87ed43c6ce49c4db213afb1e12845bb7a5d434d570ee0c51075169583c9f7 +EBUILD blender-2.61.ebuild 13765 RMD160 da7073339b97bcea808cd152e0a871f9c2bc0b4e SHA1 01d4b4b9476471ad02ab33b1a06024929041e85f SHA256 46c08fa0d152ee4b491bf8c139de5d32c8335004a13f031f58c38cbba93d756d MISC metadata.xml 2031 RMD160 7cef28cc97256936c8420d9399c5469dc917f7d1 SHA1 734027d18091dc859e24ec436f7ac992521223d7 SHA256 2aec9b99fcd11925094c06634d41af4cd3681cb81b404cc170b230dd4e337d13 diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild index a6d0e69..1817991 100644 --- a/media-gfx/blender/blender-2.60a.ebuild +++ b/media-gfx/blender/blender-2.60a.ebuild @@ -61,7 +61,7 @@ RDEPEND="virtual/jpeg jack? ( media-sound/jack-audio-connection-kit ) sndfile? ( media-libs/libsndfile ) lcms? ( media-libs/lcms ) - 3dmouse? ( media-libs/libspnav )" + 3dmouse? ( dev-libs/libspnav )" DEPEND="dev-util/scons apidoc? ( diff --git a/media-gfx/blender/blender-2.61-r1.ebuild b/media-gfx/blender/blender-2.61-r1.ebuild index af89a1e..7faa404 100644 --- a/media-gfx/blender/blender-2.61-r1.ebuild +++ b/media-gfx/blender/blender-2.61-r1.ebuild @@ -64,7 +64,7 @@ RDEPEND="virtual/jpeg fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) sndfile? ( media-libs/libsndfile ) - 3dmouse? ( media-libs/libspnav )" + 3dmouse? ( dev-libs/libspnav )" DEPEND="dev-util/scons apidoc? ( diff --git a/media-gfx/blender/blender-2.61-r2.ebuild b/media-gfx/blender/blender-2.61-r2.ebuild index bf87bc0..afd0805 100644 --- a/media-gfx/blender/blender-2.61-r2.ebuild +++ b/media-gfx/blender/blender-2.61-r2.ebuild @@ -64,7 +64,7 @@ RDEPEND="virtual/jpeg fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) sndfile? ( media-libs/libsndfile ) - 3dmouse? ( media-libs/libspnav )" + 3dmouse? ( dev-libs/libspnav )" DEPEND="dev-util/scons apidoc? ( diff --git a/media-gfx/blender/blender-2.61-r3.ebuild b/media-gfx/blender/blender-2.61-r3.ebuild index c56ebbd..8342d9a 100644 --- a/media-gfx/blender/blender-2.61-r3.ebuild +++ b/media-gfx/blender/blender-2.61-r3.ebuild @@ -66,7 +66,7 @@ RDEPEND="virtual/jpeg jack? ( media-sound/jack-audio-connection-kit ) sndfile? ( media-libs/libsndfile ) collada? ( media-libs/opencollada ) - 3dmouse? ( media-libs/libspnav )" + 3dmouse? ( dev-libs/libspnav )" DEPEND="dev-util/scons apidoc? ( diff --git a/media-gfx/blender/blender-2.61-r4.ebuild b/media-gfx/blender/blender-2.61-r4.ebuild index 8753b17..e677736 100644 --- a/media-gfx/blender/blender-2.61-r4.ebuild +++ b/media-gfx/blender/blender-2.61-r4.ebuild @@ -66,7 +66,7 @@ RDEPEND="virtual/jpeg jack? ( media-sound/jack-audio-connection-kit ) sndfile? ( media-libs/libsndfile ) collada? ( media-libs/opencollada ) - 3dmouse? ( media-libs/libspnav )" + 3dmouse? ( dev-libs/libspnav )" DEPEND="dev-util/scons apidoc? ( diff --git a/media-gfx/blender/blender-2.61.ebuild b/media-gfx/blender/blender-2.61.ebuild index 8d41505..f24e5c2 100644 --- a/media-gfx/blender/blender-2.61.ebuild +++ b/media-gfx/blender/blender-2.61.ebuild @@ -65,7 +65,7 @@ RDEPEND="virtual/jpeg jack? ( media-sound/jack-audio-connection-kit ) sndfile? ( media-libs/libsndfile ) lcms? ( media-libs/lcms ) - 3dmouse? ( media-libs/libspnav )" + 3dmouse? ( dev-libs/libspnav )" DEPEND="dev-util/scons apidoc? ( diff --git a/media-libs/libspnav/Manifest b/media-libs/libspnav/Manifest deleted file mode 100644 index e67c697..0000000 --- a/media-libs/libspnav/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX libspnav-0.2.2-custom-flags.patch 2151 RMD160 26eccbf34e404defe392333db30f433737220bc6 SHA1 e14d386825db1728261cfb9fbef2e5fd4c480383 SHA256 f3dcc7b4023e67a87a0554cdd277a836696c948b0ec01035ec6fe5dd2e4c587b -AUX libspnav-0.2.2-makefile.patch 926 RMD160 7bee7c9d4af64bdafa3178c1565a41f062a96359 SHA1 9c20ac0d0d5c2bb8f60270b0d630bb37594a0596 SHA256 ec3abb5c566b3b4bb3f18e58ff83802845ea9156cba42ed417f4da35733746e7 -DIST libspnav-0.2.2.tar.gz 11615 RMD160 d49a1c9b5e556fd8ff8e7545d0983c1b205fe9f2 SHA1 c9291ed4acb38da3be4f81e6e3b43f853ce55eca SHA256 fb72388770d7dcd85b56ac2a83948983f1afd7dbe271e18d507b975ac4bea14f -EBUILD libspnav-0.2.2.ebuild 1137 RMD160 2eb6836d930dbf9914917397378f09b14f1b921a SHA1 e60621dc9b1c668b9f9ac44d0b544e050ba59e83 SHA256 53cda83930da437ad35816c5d871d5ccdda68ff1977fde830e38d6098fdeb3ec -MISC metadata.xml 850 RMD160 ac6b9735dafead0ee2569e89dfad1e2724d69be4 SHA1 b2d86473d5a5f83a72769f9305bf23fbd494eaff SHA256 18379cae8775245952a6107dc6f447b9ab511e58b87a1299d72ada53f1498bf6 diff --git a/media-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch b/media-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch deleted file mode 100644 index cc96655..0000000 --- a/media-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in ---- libspnav-0.2.2.orig/Makefile.in 2012-01-31 22:34:01.448356249 +0100 -+++ libspnav-0.2.2/Makefile.in 2012-01-31 22:39:20.229350669 +0100 -@@ -7,7 +7,8 @@ lib_so = $(soname).1 - - CC = gcc - AR = ar --CFLAGS = $(opt) $(dbg) -std=c89 -fpic -pedantic -Wall -fno-strict-aliasing -I. -+CFLAGS = $(opt) -fpic -I. -+LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname) - - .PHONY: all - all: $(lib_a) $(lib_so) -@@ -16,7 +17,7 @@ $(lib_a): $(obj) - $(AR) rcs $@ $(obj) - - $(lib_so): $(obj) -- $(CC) -shared -Wl,-soname,$(soname) -o $@ $(obj) -+ $(CC) $(LDFLAGS) -o $@ $(obj) - - %.o: $(srcdir)/%.c - $(CC) $(CFLAGS) -c $< -o $@ -diff -Npur libspnav-0.2.2.orig/configure libspnav-0.2.2/configure ---- libspnav-0.2.2.orig/configure 2012-01-31 22:34:01.448356249 +0100 -+++ libspnav-0.2.2/configure 2012-01-31 22:34:39.703355615 +0100 -@@ -4,6 +4,7 @@ echo 'configuring spacenav library...' - - PREFIX=/usr/local - OPT=yes -+LDOPT=yes - DBG=yes - X11=yes - -@@ -26,6 +27,11 @@ for arg; do - --disable-opt) - OPT=no;; - -+ --enable-ldopt) -+ LDOPT=yes;; -+ --disable-ldopt) -+ LDOPT=no;; -+ - --enable-debug) - DBG=yes;; - --disable-debug) -@@ -44,6 +50,8 @@ for arg; do - echo ' --disable-x11: disable X11 communication mode' - echo ' --enable-opt: enable speed optimizations (default)' - echo ' --disable-opt: disable speed optimizations' -+ echo ' --enable-ldopt: enable link optimizations (default)' -+ echo ' --disable-ldopt: disable link optimizations' - echo ' --enable-debug: include debugging symbols (default)' - echo ' --disable-debug: do not include debugging symbols' - echo 'all invalid options are silently ignored' -@@ -54,6 +62,7 @@ done - - echo " prefix: $PREFIX" - echo " optimize for speed: $OPT" -+echo " optimize link: $LDOPT" - echo " include debugging symbols: $DBG" - echo " x11 communication method: $X11" - echo "" -@@ -74,7 +83,11 @@ if [ "$DBG" = 'yes' ]; then - fi - - if [ "$OPT" = 'yes' ]; then -- echo 'opt = -O3' >>Makefile -+ echo "opt = ${CFLAGS:--O3}" >>Makefile -+fi -+ -+if [ "$LDOPT" = 'yes' ]; then -+ echo "ldopt = ${LDFLAGS}" >>Makefile - fi - - if [ "$X11" = 'yes' ]; then diff --git a/media-libs/libspnav/files/libspnav-0.2.2-makefile.patch b/media-libs/libspnav/files/libspnav-0.2.2-makefile.patch deleted file mode 100644 index f65300c..0000000 --- a/media-libs/libspnav/files/libspnav-0.2.2-makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in ---- libspnav-0.2.2.orig/Makefile.in 2012-01-31 22:40:36.619349333 +0100 -+++ libspnav-0.2.2/Makefile.in 2012-01-31 22:41:52.554347975 +0100 -@@ -11,7 +11,7 @@ CFLAGS = $(opt) -I. - LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname) - - .PHONY: all --all: $(lib_a) $(lib_so) -+all: $(lib_so) - - $(lib_a): $(obj) - $(AR) rcs $@ $(obj) -@@ -31,10 +31,10 @@ distclean: - rm -f $(obj) $(lib_a) $(lib_so) Makefile - - .PHONY: install --install: $(lib_a) $(lib_so) -- cp $(lib_a) $(PREFIX)/$(libdir)/$(lib_a) -- cp $(lib_so) $(PREFIX)/$(libdir)/$(lib_so) -- for h in $(hdr); do cp -p $(srcdir)/$$h $(PREFIX)/include/; done -+install: $(lib_so) -+ mkdir -p $(DESTDIR)$(PREFIX)/$(libdir) $(DESTDIR)$(PREFIX)/include -+ cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) -+ for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done - - .PHONY: uninstall - uninstall: diff --git a/media-libs/libspnav/libspnav-0.2.2.ebuild b/media-libs/libspnav/libspnav-0.2.2.ebuild deleted file mode 100644 index 10b7c97..0000000 --- a/media-libs/libspnav/libspnav-0.2.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit multilib eutils toolchain-funcs - -MY_PN='spacenav' -DESCRIPTION="The libspnav provides a replacement of the magellan library with cleaner and more orthogonal API." -HOMEPAGE="http://spacenav.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X" - -RDEPEND="X? ( app-misc/spacenavd[X?] )" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-makefile.patch - epatch "${FILESDIR}"/${P}-custom-flags.patch -} - -src_configure() { - econf \ - --enable-opt --enable-ldopt \ - $(use_enable X x11) -} - -src_compile() { - emake CC=$(tc-getCC) -} - -src_install() { - default - - # Use proper libdir - if [[ $(get_libdir) != lib ]]; then - mv "${D}"/usr/{lib,$(get_libdir)} || die - fi - - # Create missing symlinks - local target=$(basename "${D}"/usr/$(get_libdir)/libspnav.so.*) - dosym ${target} /usr/$(get_libdir)/libspnav.so.0 || die - dosym ${target} /usr/$(get_libdir)/libspnav.so || die -} diff --git a/media-libs/libspnav/metadata.xml b/media-libs/libspnav/metadata.xml deleted file mode 100644 index 6de51ea..0000000 --- a/media-libs/libspnav/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - no-herd - - anthoine.bourgeois@gmail.com - Anthoine Bourgeois - - - sping@gentoo.org - Sebastian Pipping - - - The libspnav library is provided as a replacement of the magellan - library. It provides a cleaner, and more orthogonal interface. libspnav - supports both the original X11 protocol for communicating with the - driver, and the new alternative non-X protocol. Programs that choose to - use the X11 protocol, are automatically compatible with either the free - spacenavd driver or the official 3dxserv, as if they were using the - magellan SDK. - - -- cgit v1.2.3-65-gdbad