diff options
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/ion3/ChangeLog | 16 | ||||
| -rw-r--r-- | x11-wm/ion3/Manifest | 46 | ||||
| -rw-r--r-- | x11-wm/ion3/files/20070506/200_all_fix_includes.patch | 22 | ||||
| -rw-r--r-- | x11-wm/ion3/files/20070506/201_all_fix-paths.patch | 90 | ||||
| -rw-r--r-- | x11-wm/ion3/files/20070506/202_all_fix-menus.patch | 13 | ||||
| -rw-r--r-- | x11-wm/ion3/files/20070506/205_all_ion-lock.patch | 22 | ||||
| -rw-r--r-- | x11-wm/ion3/files/20070506/208_all_as-needed.patch | 12 | ||||
| -rw-r--r-- | x11-wm/ion3/files/digest-ion3-20070506 | 15 | ||||
| -rw-r--r-- | x11-wm/ion3/ion3-20070506.ebuild | 189 |
9 files changed, 417 insertions, 8 deletions
diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog index 97162c5ea0fd..8a068246eace 100644 --- a/x11-wm/ion3/ChangeLog +++ b/x11-wm/ion3/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for x11-wm/ion3 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.49 2007/04/30 16:04:17 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.50 2007/05/31 09:42:57 mabi Exp $ + +*ion3-20070506 (12 May 2007) + + 12 May 2007; Matti Bickel <mabi@gentoo.org> + +files/20070506/200_all_fix_includes.patch, + +files/20070506/201_all_fix-paths.patch, + +files/20070506/202_all_fix-menus.patch, + +files/20070506/205_all_ion-lock.patch, + +files/20070506/208_all_as-needed.patch, +ion3-20070506.ebuild: + Version bump. Note that this is the first release candidate. All + unconditional patches are minor according to the changed license file. + Also note that IUSE has changed in accordance with the new license. + Please reproduce any error you might have with all useflags disabled before + bugging upstream. File bugs at bugs.gentoo.org instead. *ion3-20070318-r2 (30 Apr 2007) diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest index d3323d44765f..4ec9208fccad 100644 --- a/x11-wm/ion3/Manifest +++ b/x11-wm/ion3/Manifest @@ -53,6 +53,26 @@ AUX 20070318/208_all_as-needed.patch 350 RMD160 d4a5d21442b8cdb618e116dd542389b2 MD5 477892385b4dd0708761fe54886459d7 files/20070318/208_all_as-needed.patch 350 RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 files/20070318/208_all_as-needed.patch 350 SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893 files/20070318/208_all_as-needed.patch 350 +AUX 20070506/200_all_fix_includes.patch 893 RMD160 cc39ca826bacfd0c3d1ea5f2d314fb0b52e27fb7 SHA1 a3661dc5568a8417f2efba212fd6785c4ac67aa4 SHA256 e8b2cefc75631d9ea7e5085528eea5f51fc4d41b9dd8d02d9da039928cb55ee2 +MD5 8f7a63a0ee74b4ecce09dbc78f84a26c files/20070506/200_all_fix_includes.patch 893 +RMD160 cc39ca826bacfd0c3d1ea5f2d314fb0b52e27fb7 files/20070506/200_all_fix_includes.patch 893 +SHA256 e8b2cefc75631d9ea7e5085528eea5f51fc4d41b9dd8d02d9da039928cb55ee2 files/20070506/200_all_fix_includes.patch 893 +AUX 20070506/201_all_fix-paths.patch 2578 RMD160 1e507b2b7493f94c9e63de2d1c5e7a4a370f2bbe SHA1 92cb162401d7e970a1429437bfeef9c9684f62fb SHA256 e1eca4fca542aeeb2b6dd39b7f082d49dc7c9b526bb23b668c72fab639c2c76c +MD5 e9d2532398ca5bebda1b6e3758227006 files/20070506/201_all_fix-paths.patch 2578 +RMD160 1e507b2b7493f94c9e63de2d1c5e7a4a370f2bbe files/20070506/201_all_fix-paths.patch 2578 +SHA256 e1eca4fca542aeeb2b6dd39b7f082d49dc7c9b526bb23b668c72fab639c2c76c files/20070506/201_all_fix-paths.patch 2578 +AUX 20070506/202_all_fix-menus.patch 990 RMD160 a49c2e8c44c4c7ddceae989a0637cb4ca51647f4 SHA1 ef72a6d5b100c8148d96f6718bc95a456a3b51eb SHA256 2f9404a884e28f9d7ff42ba6ae24df99436b7a9f3c75560282fb87daa9fdf9af +MD5 aecae9e8f4e48e9b74532a3309643598 files/20070506/202_all_fix-menus.patch 990 +RMD160 a49c2e8c44c4c7ddceae989a0637cb4ca51647f4 files/20070506/202_all_fix-menus.patch 990 +SHA256 2f9404a884e28f9d7ff42ba6ae24df99436b7a9f3c75560282fb87daa9fdf9af files/20070506/202_all_fix-menus.patch 990 +AUX 20070506/205_all_ion-lock.patch 780 RMD160 9834836d55fb390f06d8e3c1ea821ef01c1a74b8 SHA1 6bd0278dd7d56fd9f1025fae8a00db24bf0e781f SHA256 ea4ad810355fab8a848e6506a6a2762b5ab9c37f28a7edac73030e6026bc3fae +MD5 4f2dcedcbf6d885723d1b888f0aacb87 files/20070506/205_all_ion-lock.patch 780 +RMD160 9834836d55fb390f06d8e3c1ea821ef01c1a74b8 files/20070506/205_all_ion-lock.patch 780 +SHA256 ea4ad810355fab8a848e6506a6a2762b5ab9c37f28a7edac73030e6026bc3fae files/20070506/205_all_ion-lock.patch 780 +AUX 20070506/208_all_as-needed.patch 350 RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 SHA1 2a59201ad480f35e7553c4bd470c696fc5dc0436 SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893 +MD5 477892385b4dd0708761fe54886459d7 files/20070506/208_all_as-needed.patch 350 +RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 files/20070506/208_all_as-needed.patch 350 +SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893 files/20070506/208_all_as-needed.patch 350 AUX ion3-20060317-truetype.patch 19704 RMD160 6a11b4d81926224171618c036b5597948e23d89a SHA1 c387e111c65d098793ef59d020225d3770688a2a SHA256 a1934d7ea40f959579b4b4b20f08bcbc9f037beb7e50737f8110273f7f5f58d5 MD5 f77e47b00b912f3b0b6bb35a53f158a1 files/ion3-20060317-truetype.patch 19704 RMD160 6a11b4d81926224171618c036b5597948e23d89a files/ion3-20060317-truetype.patch 19704 @@ -76,11 +96,16 @@ SHA256 d5e57e91185ae5c508ed036d689b5ea58e7322b633705503cfaa5ac18ff9f936 files/xf DIST ion-3ds-20060326.tar.gz 617533 RMD160 147e6ad20c69ca8fe5a80dcd57ce6002a2b3cde1 SHA1 5202322198071f7cee2aefc2bcc8bd0b3a08a490 SHA256 9f3c96c961e47c61e9c10b57de820b608b9d9fdaa43a893e63499b3f17231124 DIST ion-3ds-20061223.tar.gz 649463 RMD160 dc61a012354a30f1a83b8b0970b8c09724ea4c9c SHA1 8bccf120ce27b26feb67a916ba61748e85e69733 SHA256 0970fef74de659de45813471560ebe2f97b893de7a238ea00755fcaeb9b7d89e DIST ion-3ds-20070318.tar.gz 657282 RMD160 a7cc9baea3624b0ed840fdc82fc5db2ac1018d9a SHA1 f352a1c7f6f465478141d538b2a4c3f3e81a4f30 SHA256 712da027fb12774f67d933d95a95452d98a5658617fc5515011ca79b6035258a +DIST ion-3rc-20070506.tar.gz 640482 RMD160 b5dda6a7a48c1f3d433b2a2b1c37294ece79a259 SHA1 81071df77b720ebad5630bd15a4c6b6e0787caf0 SHA256 850dce3bd1be5d200fda5ba3e6085f397b35c720f7758dc5481bf503fe5d2f56 +DIST ion-doc-3rc-20070506.tar.gz 669471 RMD160 aa9e75b60c121d3cd62f60afed4592fe1bc0da87 SHA1 1991e12e4f72153f2e02c70910322317c73a7c01 SHA256 9dac4f5e69121b98cf6e5da455d6185f00605cf237f14fc4f8578446f622476e DIST ion3-doc-20070318.tar.bz2 38870 RMD160 5fc0225ad23f1c96b5e979d66185ea608372297d SHA1 93c14f675f5fba3212232ed127af4d4481716884 SHA256 22ca643ca5df67086f12d3f106b16094017477c41fd1ebd73d30607db206821b +DIST ion3-mod-ionflux-20070512.tar.bz2 12770 RMD160 8e834de0c3048b676bc5c5d5454aedac09129eb3 SHA1 d482654557104adfbf6d184e44f87a993577720a SHA256 63c4902159923aa02921e39aa7746ca8819ba1c216efa8fa6384fd093f60d18c DIST ion3-mod-ionflux_20061022.orig.tar.gz 14847 RMD160 86bcc2a260f3e37d613bcebd66f37616e56d3926 SHA1 64d56a158de66cd15b03dfdccc8162509432fa01 SHA256 f9fd872d2d5b35f882d9a9161dee52fd5b2bb346c46f9e6cc30922dcda99c935 DIST ion3-mod-xrandr-20061021.tar.bz2 10762 RMD160 cca3f472e32b8aff1ce8af123c24e17574c1b197 SHA1 9c36bc4be2a97f6a9256054ffbb946ad7dc6965a SHA256 cd2225a356ddfc6f02062bf23c1e90fa573661347ff185316aeae0e18eee72ef DIST ion3-mod-xrandr-20070220.tar.bz2 10822 RMD160 680714961af7e6b81896c4d989baded5ea4c5222 SHA1 11e3829f16b48e90de71469b2013a0cda9ac2eb8 SHA256 858a72ad203fb98f3cea672809a2cdfd7cb87cfa744e622e5a04d2f87cc1ae38 +DIST ion3-mod-xrandr-20070410.tar.bz2 10833 RMD160 8542c0dfebfd1536e6a1ad89a3b791609ca8f16e SHA1 a1ef665e0914154bf89f8b5fc8f282695438f06f SHA256 80f23a435b21f8691fc63b78394fa29b25b5304f46895dd961ac905bcc76c82f DIST ion3-scripts-20070322.tar.bz2 101212 RMD160 101a6dd933b5b9b495ca4607a7e0d48d48a9c409 SHA1 7dbbec42f3b97da16d05987347f0c3ae54c76eec SHA256 6864d75f2f7ca021368b52051c297f5590047257ca39d0332af65c7fef0f8d39 +DIST ion3-scripts-20070510.tar.bz2 100952 RMD160 4ac0fff86a039d5890bd934d80c33bb5a78fb02d SHA1 c255ed826a19bc681ed34f41c4cd6dd053da76d6 SHA256 53c4705ab6f880404aae92cef3018a956ee1b55d0e22ef93c12d30527a419a61 DIST ion3-scripts_20061214.orig.tar.gz 129181 RMD160 b22827c490f23252c1953582d24a19a5aa0aaed0 SHA1 7095657b7bc3f7eba5e564e67ca09bb7b0e1a010 SHA256 82e25973fcfdd282bdb3734191f8a5b0d711b2bf0cb64196d3b42351185fdbcf DIST xft-ion3-for-darcs-20061202.diff 20126 RMD160 054efa097492531d800bca85582d5b6836567408 SHA1 2405218fb387c3ac76ff1612bd6f4482cf459a0f SHA256 6af98c329395acb46ddbdac4f0ba023c6e5344914cc06cdfa82339526ce25b3c EBUILD ion3-20060326.ebuild 1894 RMD160 14b5b0dc8fce4822386f9069aef5459bde9cc7eb SHA1 ac14b0d332f4f6998c0941412449991adea7eb60 SHA256 42e86ce1ec89e0d895d8c1e665987dcacc261697c5a87b91c3b4e938d86cbd74 @@ -99,10 +124,14 @@ EBUILD ion3-20070318.ebuild 4359 RMD160 4770f3d3e58bca2e2373ac4421b4721463227ebf MD5 af1afc207ecfc2b555ae71c9d995a4e9 ion3-20070318.ebuild 4359 RMD160 4770f3d3e58bca2e2373ac4421b4721463227ebf ion3-20070318.ebuild 4359 SHA256 9bd53911c457fd2aca0d1790e0bca7c194cce680124f54d70eec69c43d3473fd ion3-20070318.ebuild 4359 -MISC ChangeLog 7884 RMD160 e4329904b62fb0830d775fcce74e799c61c70af3 SHA1 ac0835da48b674340e2d4d712e8baea030dafcc5 SHA256 ce411b1dfbea143908f6ad280f6f7732c27806220c53c19a89617c8a327e79ef -MD5 df0353d3ce4b2e3618cae895c19f35cf ChangeLog 7884 -RMD160 e4329904b62fb0830d775fcce74e799c61c70af3 ChangeLog 7884 -SHA256 ce411b1dfbea143908f6ad280f6f7732c27806220c53c19a89617c8a327e79ef ChangeLog 7884 +EBUILD ion3-20070506.ebuild 4918 RMD160 7fe8c67bcd01748a8566f7249738d0d8ae2dfc40 SHA1 6638e4ec38c3fe6671c101ffcc438c2cbdce005b SHA256 8d2e0a64e380085ea61e47efb8a34d42308b25640383b56ae67264ec5d6ce501 +MD5 7d45653c82eb55e7aa286dcbeede1713 ion3-20070506.ebuild 4918 +RMD160 7fe8c67bcd01748a8566f7249738d0d8ae2dfc40 ion3-20070506.ebuild 4918 +SHA256 8d2e0a64e380085ea61e47efb8a34d42308b25640383b56ae67264ec5d6ce501 ion3-20070506.ebuild 4918 +MISC ChangeLog 8547 RMD160 002937064c35a84a7843cb25fbba9b5acff49036 SHA1 8a5ba4c7d027ecbf946e6d782b4b126bded50d18 SHA256 df6a062bc9fb84d786bb607b92171e1c05de3ebd4979ba5c6f0eaebf4061b674 +MD5 334d5335cc7dbab85b936e0c54bd4c88 ChangeLog 8547 +RMD160 002937064c35a84a7843cb25fbba9b5acff49036 ChangeLog 8547 +SHA256 df6a062bc9fb84d786bb607b92171e1c05de3ebd4979ba5c6f0eaebf4061b674 ChangeLog 8547 MISC metadata.xml 244 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d SHA1 bee870f83b6bd74feedef2b9ff8da8f4820cc19f SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d metadata.xml 244 @@ -119,10 +148,13 @@ SHA256 b2181757e7912e1c67e67d7f3e4200e3cf9b8c4d2eea0ff964f2e92e6e3ea66d files/di MD5 1f454e2ba54eec9e1f3fa03e307b61f6 files/digest-ion3-20070318-r2 1045 RMD160 7087b16c049c3b8b4d150ab7eb8a461e67ae28e6 files/digest-ion3-20070318-r2 1045 SHA256 b2181757e7912e1c67e67d7f3e4200e3cf9b8c4d2eea0ff964f2e92e6e3ea66d files/digest-ion3-20070318-r2 1045 +MD5 d738828fdba8dec081e12431ad73be86 files/digest-ion3-20070506 1331 +RMD160 2bb97783b8262b0ec65a9dcd75d359dc3ef1a2e3 files/digest-ion3-20070506 1331 +SHA256 f2b7c50a3bf973359aa6e899f99fede7ebdd3698b2e93918d9f5e1306ef6ae19 files/digest-ion3-20070506 1331 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFGNhMffNMcoUhJ7GwRAuhmAJ0UeJPYhz5N1/u7jhOvqJ0pBCSIPACgmzjS -Ce+ZT17dA9l11cMOakFXl7M= -=Bhfp +iD8DBQFGXpgLfNMcoUhJ7GwRAj2hAKCs6DQToyzT67P2vEoqm9Vg1QRFKwCgjKaI +UBwaN+LY87P1o/R2lsgGWJQ= +=edc1 -----END PGP SIGNATURE----- diff --git a/x11-wm/ion3/files/20070506/200_all_fix_includes.patch b/x11-wm/ion3/files/20070506/200_all_fix_includes.patch new file mode 100644 index 000000000000..19f7edc512db --- /dev/null +++ b/x11-wm/ion3/files/20070506/200_all_fix_includes.patch @@ -0,0 +1,22 @@ +diff -uNr ion-3rc-20070506.orig/ioncore/ioncore.c ion-3rc-20070506/ioncore/ioncore.c +--- ion-3rc-20070506.orig/ioncore/ioncore.c 2007-05-12 22:04:33.000000000 +0200 ++++ ion-3rc-20070506/ioncore/ioncore.c 2007-05-12 22:23:30.000000000 +0200 +@@ -11,6 +11,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <string.h> ++#include <strings.h> + #include <errno.h> + #include <sys/types.h> + #include <ctype.h> +diff -uNr ion-3rc-20070506.orig/utils/ion-completefile/ion-completefile.c ion-3rc-20070506/utils/ion-completefile/ion-completefile.c +--- ion-3rc-20070506.orig/utils/ion-completefile/ion-completefile.c 2007-05-12 22:04:33.000000000 +0200 ++++ ion-3rc-20070506/utils/ion-completefile/ion-completefile.c 2007-05-12 22:05:13.000000000 +0200 +@@ -54,6 +54,7 @@ + + #include <sys/param.h> + #include <sys/types.h> ++#include <stdio.h> + #include <stdlib.h> + #include <dirent.h> + #include <string.h> diff --git a/x11-wm/ion3/files/20070506/201_all_fix-paths.patch b/x11-wm/ion3/files/20070506/201_all_fix-paths.patch new file mode 100644 index 000000000000..7f8f228fed40 --- /dev/null +++ b/x11-wm/ion3/files/20070506/201_all_fix-paths.patch @@ -0,0 +1,90 @@ +diff -Nur ion-3ds-20060519.orig/system.mk ion-3ds-20060519/system.mk +--- ion-3ds-20060519.orig/system.mk 2006-05-18 18:06:53.000000000 -0500 ++++ ion-3ds-20060519/system.mk 2006-05-18 23:51:23.000000000 -0500 +@@ -7,7 +7,7 @@ + ## Installation paths + ## + +-PREFIX=/usr/local ++PREFIX=/usr + + # Unless you are creating a package conforming to some OS's standards, you + # probably do not want to modify the following directories: +@@ -15,7 +15,7 @@ + # Main binaries + BINDIR=$(PREFIX)/bin + # Configuration .lua files +-ETCDIR=$(PREFIX)/etc/ion3 ++ETCDIR=/etc/X11/ion3 + # Some .lua files and ion-* shell scripts + SHAREDIR=$(PREFIX)/share/ion3 + # Manual pages +@@ -27,11 +27,11 @@ + # Nothing at the moment + LIBDIR=$(PREFIX)/lib + # Modules +-MODULEDIR=$(LIBDIR)/ion3/mod ++MODULEDIR=$(LIBDIR)/ion3/mod + # Compiled Lua source code + LCDIR=$(LIBDIR)/ion3/lc + # ion-completefile (does not belong in SHAREDIR being a binary file) +-EXTRABINDIR=$(LIBDIR)/ion3/bin ++EXTRABINDIR=$(LIBDIR)/ion3/bin + # For ion-completeman system-wide cache + VARDIR=/var/cache/ion3 + # Message catalogs +@@ -56,18 +56,18 @@ + + # If you have installed Lua 5.1 from the official tarball without changing + # paths, this should do it. +-LUA_DIR=/usr/local +-LUA_LIBS = -L$(LUA_DIR)/lib -llua +-LUA_INCLUDES = -I$(LUA_DIR)/include +-LUA=$(LUA_DIR)/bin/lua +-LUAC=$(LUA_DIR)/bin/luac ++#LUA_DIR=/usr/local ++#LUA_LIBS = -L$(LUA_DIR)/lib -llua ++#LUA_INCLUDES = -I$(LUA_DIR)/include ++#LUA=$(LUA_DIR)/bin/lua ++#LUAC=$(LUA_DIR)/bin/luac + + # If you are using the Debian packages, the following settings should be + # what you want. +-#LUA_LIBS=`pkg-config --libs lua5.1` +-#LUA_INCLUDES=`pkg-config --cflags lua5.1` +-#LUA=`which lua5.1` +-#LUAC=`which luac5.1` ++LUA_LIBS=`pkg-config --libs lua` ++LUA_INCLUDES=`pkg-config --cflags lua` ++LUA=`which lua` ++LUAC=`which luac` + + + ## +@@ -107,7 +107,7 @@ + # asprintf and vasprintf in the c library. (gnu libc has.) + # If HAS_SYSTEM_ASPRINTF is not defined, an implementation + # in sprintf_2.2/ is used. +-#HAS_SYSTEM_ASPRINTF=1 ++HAS_SYSTEM_ASPRINTF=1 + + + # If you're on an archaic system (such as relatively recent *BSD releases) +@@ -144,14 +144,14 @@ + + #C89_SOURCE=-ansi + +-#POSIX_SOURCE=-D_POSIX_SOURCE ++POSIX_SOURCE=-D_POSIX_SOURCE + + # Most systems +-#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED ++XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED + # SunOS, (Irix) + #XOPEN_SOURCE=-D__EXTENSIONS__ + +-#C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY ++C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY + + # The -DCF_HAS_VA_COPY option should allow for some optimisations, and + # in some cases simply defining diff --git a/x11-wm/ion3/files/20070506/202_all_fix-menus.patch b/x11-wm/ion3/files/20070506/202_all_fix-menus.patch new file mode 100644 index 000000000000..c2d77c89cfa6 --- /dev/null +++ b/x11-wm/ion3/files/20070506/202_all_fix-menus.patch @@ -0,0 +1,13 @@ +diff -Naur ../work/ion-3ds-20061223/etc/cfg_ioncore.lua ion-3ds-20061223/etc/cfg_ioncore.lua +--- ../work/ion-3ds-20061223/etc/cfg_ioncore.lua 2006-12-23 17:59:43.000000000 +0300 ++++ ion-3ds-20061223/etc/cfg_ioncore.lua 2006-12-31 15:35:59.000000000 +0300 +@@ -331,7 +331,8 @@ + defmenu("mainmenu", { + menuentry("Run...", "mod_query.query_exec(_)"), + menuentry("Terminal", "ioncore.exec_on(_, XTERM or 'xterm')"), +- menuentry("Lock screen", "ioncore.exec_on(_, 'xlock')"), ++ menuentry("Lock screen", ++ "ioncore.exec_on(_, ioncore.lookup_script('ion-lock'))"), + menuentry("Help", "mod_query.query_man(_)"), + menuentry("About Ion", "mod_query.show_about_ion(_)"), + submenu("Styles", "stylemenu"), diff --git a/x11-wm/ion3/files/20070506/205_all_ion-lock.patch b/x11-wm/ion3/files/20070506/205_all_ion-lock.patch new file mode 100644 index 000000000000..dda201612800 --- /dev/null +++ b/x11-wm/ion3/files/20070506/205_all_ion-lock.patch @@ -0,0 +1,22 @@ +diff -Nur ion3-20050322.orig/utils/Makefile ion3-20050322/utils/Makefile +--- ion3-20050322.orig/utils/Makefile 2005-03-22 14:31:06.000000000 +0000 ++++ ion3-20050322/utils/Makefile 2005-03-22 16:29:37.197355881 +0000 +@@ -11,7 +11,7 @@ + SUBDIRS=ion-completefile + INSTALL_SUBDIRS=$(SUBDIRS) + +-SHELLSCRIPTS = ion-runinxterm ion-completeman ++SHELLSCRIPTS = ion-runinxterm ion-completeman ion-lock + + TARGETS = ion-completeman + +diff -Nur ion3-20050322.orig/utils/ion-lock ion3-20050322/utils/ion-lock +--- ion3-20050322.orig/utils/ion-lock 1970-01-01 00:00:00.000000000 +0000 ++++ ion3-20050322/utils/ion-lock 2005-03-22 16:29:19.550092305 +0000 +@@ -0,0 +1,6 @@ ++#!/bin/sh ++if xscreensaver-command -version >/dev/null 2>&1; then ++ exec xscreensaver-command -lock ++else ++ exec xlock ++fi diff --git a/x11-wm/ion3/files/20070506/208_all_as-needed.patch b/x11-wm/ion3/files/20070506/208_all_as-needed.patch new file mode 100644 index 000000000000..662a078df303 --- /dev/null +++ b/x11-wm/ion3/files/20070506/208_all_as-needed.patch @@ -0,0 +1,12 @@ +diff -uNr ion-3ds-20070318.orig/de/Makefile ion-3ds-20070318/de/Makefile +--- ion-3ds-20070318.orig/de/Makefile 2007-03-18 21:31:37.000000000 +0100 ++++ ion-3ds-20070318/de/Makefile 2007-04-30 17:30:23.000000000 +0200 +@@ -17,6 +17,8 @@ + + MAKE_EXPORTS=de + ++LDFLAGS+=-lXext ++ + ###################################### + + include $(TOPDIR)/build/rules.mk diff --git a/x11-wm/ion3/files/digest-ion3-20070506 b/x11-wm/ion3/files/digest-ion3-20070506 new file mode 100644 index 000000000000..bfefeec9b528 --- /dev/null +++ b/x11-wm/ion3/files/digest-ion3-20070506 @@ -0,0 +1,15 @@ +MD5 c005ebeb89894eefbb414897d874cee6 ion-3rc-20070506.tar.gz 640482 +RMD160 b5dda6a7a48c1f3d433b2a2b1c37294ece79a259 ion-3rc-20070506.tar.gz 640482 +SHA256 850dce3bd1be5d200fda5ba3e6085f397b35c720f7758dc5481bf503fe5d2f56 ion-3rc-20070506.tar.gz 640482 +MD5 45dc4b83f2badbade8389953b3c49da7 ion-doc-3rc-20070506.tar.gz 669471 +RMD160 aa9e75b60c121d3cd62f60afed4592fe1bc0da87 ion-doc-3rc-20070506.tar.gz 669471 +SHA256 9dac4f5e69121b98cf6e5da455d6185f00605cf237f14fc4f8578446f622476e ion-doc-3rc-20070506.tar.gz 669471 +MD5 c8c2d7b039f751db017275f5f977702e ion3-mod-ionflux-20070512.tar.bz2 12770 +RMD160 8e834de0c3048b676bc5c5d5454aedac09129eb3 ion3-mod-ionflux-20070512.tar.bz2 12770 +SHA256 63c4902159923aa02921e39aa7746ca8819ba1c216efa8fa6384fd093f60d18c ion3-mod-ionflux-20070512.tar.bz2 12770 +MD5 dcb17665b215d0891be40392f57197c1 ion3-mod-xrandr-20070410.tar.bz2 10833 +RMD160 8542c0dfebfd1536e6a1ad89a3b791609ca8f16e ion3-mod-xrandr-20070410.tar.bz2 10833 +SHA256 80f23a435b21f8691fc63b78394fa29b25b5304f46895dd961ac905bcc76c82f ion3-mod-xrandr-20070410.tar.bz2 10833 +MD5 33495ed87edd9c5734a1c413847a3b3d ion3-scripts-20070510.tar.bz2 100952 +RMD160 4ac0fff86a039d5890bd934d80c33bb5a78fb02d ion3-scripts-20070510.tar.bz2 100952 +SHA256 53c4705ab6f880404aae92cef3018a956ee1b55d0e22ef93c12d30527a419a61 ion3-scripts-20070510.tar.bz2 100952 diff --git a/x11-wm/ion3/ion3-20070506.ebuild b/x11-wm/ion3/ion3-20070506.ebuild new file mode 100644 index 000000000000..dda9484a2eab --- /dev/null +++ b/x11-wm/ion3/ion3-20070506.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20070506.ebuild,v 1.1 2007/05/31 09:42:57 mabi Exp $ + +inherit eutils flag-o-matic + +MY_PV=${PV/_p/-} +MY_PN=ion-3rc-${MY_PV} + +SCRIPTS_PV=20070510 +SCRIPTS_PN=ion3-scripts + +IONFLUX_PV=20070512 +IONFLUX_PN=ion3-mod-ionflux + +IONXRANDR_PV=20070410 +IONXRANDR_PN=ion3-mod-xrandr + +IONDOC_PV=20070506 +IONDOC_PN=ion-doc-3rc + +DESCRIPTION="A tiling tabbed window manager designed with keyboard users in mind" +HOMEPAGE="http://www.iki.fi/tuomov/ion/" +SRC_URI="http://iki.fi/tuomov/dl/${MY_PN}.tar.gz + mirror://gentoo/${SCRIPTS_PN}-${SCRIPTS_PV}.tar.bz2 + mirror://gentoo/${IONXRANDR_PN}-${IONXRANDR_PV}.tar.bz2 + mirror://gentoo/${IONFLUX_PN}-${IONFLUX_PV}.tar.bz2 + doc? ( http://iki.fi/tuomov/dl/${IONDOC_PN}-${IONDOC_PV}.tar.gz )" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="unicode voidsupport-truetype doc" +DEPEND=" + || ( + ( + x11-libs/libICE + x11-libs/libXext + x11-libs/libSM + voidsupport-truetype? ( x11-libs/libXft ) + ) + virtual/x11 + ) + dev-util/pkgconfig + app-misc/run-mailcap + >=dev-lang/lua-5.1.1 + doc? ( dev-tex/latex2html + virtual/tetex )" + +S=${WORKDIR}/${MY_PN} + +SCRIPTS_DIRS="keybindings scripts statusbar statusd styles" +MODULES="${IONXRANDR_PN}-${IONXRANDR_PV} ${IONFLUX_PN}-${IONFLUX_PV}" + +src_unpack() { + unpack ${A} + + cd ${S} + EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" epatch + use voidsupport-truetype && epatch ${FILESDIR}/xft-ion3-${PV}.patch + + use voidsupport-truetype && sed -i -e "s:#USE_XFT=1:USE_XFT=1:" ${S}/system.mk + + # Allow user CFLAGS + sed -i "s:\(CFLAGS=\)-g -Os\(.*\):\1\2 ${CFLAGS}:" system.mk + + # Allow user LDFLAGS + sed -i "s:\(LDFLAGS=\)-g -Os\(.*\):\1\2 ${LDFLAGS}:" system.mk + + # Don't strip ionflux + sed -i "s:-s::" "../${IONFLUX_PN}-${IONFLUX_PV}/ionflux/Makefile" + + # Make snprintf avaible to ion-completefile + sed -i 's:\(CFLAGS +=.*\):\1 $(C99_SOURCE):' utils/ion-completefile/Makefile + + # Rewrite install directories to be prefixed by DESTDIR for sake of portage's sandbox + sed -i 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g' Makefile */Makefile */*/Makefile build/rules.mk + + for i in ${MODULES} + do + cd ${WORKDIR}/${i} + # Rewrite install directories to be prefixed by DESTDIR for sake of portage's sandbox + sed -i Makefile */Makefile \ + -e 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g' + + done + cd ${S} + + # Hey guys! Implicit rules apply to include statements also. Be more careful! + # Fix an implicit rule that will kill the installation by rewriting a .mk + # should configure be given just the right set of options. + sed -i 's!%: %.in!ion-completeman: %: %.in!g' utils/Makefile + + # Fix prestripping of files + sed -i mod_statusbar/ion-statusd/Makefile utils/ion-completefile/Makefile \ + -e 's: -s::' + + # FIX for modules + cd ${WORKDIR} + ln -s ${MY_PN} ion-3 +} + +src_compile() { + local myconf="" + + # xfree + if has_version '>=x11-base/xfree-4.3.0'; then + sed -i -e "s:DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND:#DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND:" ${S}/system.mk + fi + + # help out this arch as it can't handle certain shared library linkage + use hppa && sed -i -e "s:#PRELOAD_MODULES=1:PRELOAD_MODULES=1:" ${S}/system.mk + + # unicode support + use unicode && sed -i -e "s:#DEFINES += -DCF_DE_USE_XUTF8:DEFINES += -DCF_DE_USE_XUTF8:" ${S}/system.mk + + cd ${S} + make \ + LIBDIR=$(get_libdir) \ + DOCDIR=/usr/share/doc/${PF} || die + + for i in ${MODULES} + do + cd ${WORKDIR}/${i} + + emake \ + LIBDIR=$(get_libdir) + done + + if ( use doc ) + then + export MT_FEATURES=varfonts + mkdir -p ${T}/var/cache/fonts + export VARTEXFONTS=${T}/var/cache/fonts + + cd ${WORKDIR}/${IONDOC_PN}-${IONDOC_PV} + make all + make all-pdf + fi +} + +src_install() { + + emake \ + DESTDIR=${D} \ + DOCDIR=/usr/share/doc/${PF} \ + install || die + + echo -e "#!/bin/sh\n/usr/bin/ion3" > ${T}/ion3 + echo -e "#!/bin/sh\n/usr/bin/pwm3" > ${T}/pwm3 + exeinto /etc/X11/Sessions + doexe ${T}/ion3 ${T}/pwm3 + + insinto /usr/share/xsessions + doins ${FILESDIR}/ion3.desktop ${FILESDIR}/pwm3.desktop + + cd ${WORKDIR}/${SCRIPTS_PN}-${SCRIPTS_PV} + insinto /usr/share/ion3 + find $SCRIPTS_DIRS -type f |\ + while read FILE + do + doins $PWD/$FILE + done + + for i in ${MODULES} + do + cd ${WORKDIR}/${i} + + emake \ + DESTDIR=${D} \ + install || die + + done + + if ( use doc ) + then + cd ${WORKDIR}/${IONDOC_PN}-${IONDOC_PV} + dodoc *.pdf + fi + + sed -i -e '/dopath("mod_sp")/a\dopath("mod_xrandr")' ${D}/etc/X11/ion3/cfg_defaults.lua +} + +pkg_postinst() { + elog "This version of ion3 contains no xinerama support (removed upstream)." + elog "If you encouter a bug in ion-3, be sure to to reproduce it with a" + elog "vanilla build before reporting it upstream. You are welcome to report" + elog "any problem as a bug on http://bugs.gentoo.org." +} |