From 4dc64c04667336f28259cd35a871211d1022089d Mon Sep 17 00:00:00 2001 From: Matti Bickel Date: Fri, 1 Jun 2007 22:55:01 +0000 Subject: 321fix get_libdir use, fix license, cleanup Package-Manager: portage-2.1.2.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- x11-wm/ion3/ChangeLog | 8 +- x11-wm/ion3/Manifest | 35 +++--- x11-wm/ion3/files/digest-ion3-20070318 | 12 -- x11-wm/ion3/files/digest-ion3-20070506 | 15 --- x11-wm/ion3/files/digest-ion3-20070506-r1 | 15 +++ x11-wm/ion3/ion3-20070318.ebuild | 191 ------------------------------ x11-wm/ion3/ion3-20070506-r1.ebuild | 189 +++++++++++++++++++++++++++++ x11-wm/ion3/ion3-20070506.ebuild | 189 ----------------------------- 8 files changed, 225 insertions(+), 429 deletions(-) delete mode 100644 x11-wm/ion3/files/digest-ion3-20070318 delete mode 100644 x11-wm/ion3/files/digest-ion3-20070506 create mode 100644 x11-wm/ion3/files/digest-ion3-20070506-r1 delete mode 100644 x11-wm/ion3/ion3-20070318.ebuild create mode 100644 x11-wm/ion3/ion3-20070506-r1.ebuild delete mode 100644 x11-wm/ion3/ion3-20070506.ebuild (limited to 'x11-wm') diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog index 8a068246eace..e064f302dd04 100644 --- a/x11-wm/ion3/ChangeLog +++ b/x11-wm/ion3/ChangeLog @@ -1,6 +1,12 @@ # 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.50 2007/05/31 09:42:57 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.51 2007/06/01 22:55:01 mabi Exp $ + +*ion3-20070506-r1 (01 Jun 2007) + + 01 Jun 2007; Matti Bickel -ion3-20070318.ebuild, + -ion3-20070506.ebuild, +ion3-20070506-r1.ebuild: + fix retarded use of $(get_libdir), fix LICENSE *ion3-20070506 (12 May 2007) diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest index 4ec9208fccad..98b8020bc8b7 100644 --- a/x11-wm/ion3/Manifest +++ b/x11-wm/ion3/Manifest @@ -120,18 +120,14 @@ EBUILD ion3-20070318-r2.ebuild 4371 RMD160 3fd8c5b901364b6e6f148bdb9c6b82d812578 MD5 9f6ead3bb2b5abcb1040d94a2e5995e2 ion3-20070318-r2.ebuild 4371 RMD160 3fd8c5b901364b6e6f148bdb9c6b82d8125782a0 ion3-20070318-r2.ebuild 4371 SHA256 b2f06db4a9301527716d2373ffe7d2a0c30ce2aa3556be7f4a249cb4791f9e59 ion3-20070318-r2.ebuild 4371 -EBUILD ion3-20070318.ebuild 4359 RMD160 4770f3d3e58bca2e2373ac4421b4721463227ebf SHA1 e04663e214090ae7b9be26f1bb32d44a3eb72534 SHA256 9bd53911c457fd2aca0d1790e0bca7c194cce680124f54d70eec69c43d3473fd -MD5 af1afc207ecfc2b555ae71c9d995a4e9 ion3-20070318.ebuild 4359 -RMD160 4770f3d3e58bca2e2373ac4421b4721463227ebf ion3-20070318.ebuild 4359 -SHA256 9bd53911c457fd2aca0d1790e0bca7c194cce680124f54d70eec69c43d3473fd ion3-20070318.ebuild 4359 -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 +EBUILD ion3-20070506-r1.ebuild 4938 RMD160 144afaa870cdb2f7752eb2f9abfbafbf141317e2 SHA1 62eddfdd7785bfa9cc2e1b1300c8709bc753e898 SHA256 42bbfab90164ba52ab9b69e341096d97c9f70fa892c5f6c1fa2926f94a0a6748 +MD5 c0089976a54980ac5b3986eb74ab6897 ion3-20070506-r1.ebuild 4938 +RMD160 144afaa870cdb2f7752eb2f9abfbafbf141317e2 ion3-20070506-r1.ebuild 4938 +SHA256 42bbfab90164ba52ab9b69e341096d97c9f70fa892c5f6c1fa2926f94a0a6748 ion3-20070506-r1.ebuild 4938 +MISC ChangeLog 8750 RMD160 68d23145d88374e4a5105bce1b38e73c1b401dfa SHA1 e0b095788df30048dce8b9352ee415bd204e3b01 SHA256 4860ec2c7d72da020b1943b4d6a23d7ecf48b80c1f5a59f47911ce87eb88fb4c +MD5 9d6b981046e3cd83c4df99e339364d66 ChangeLog 8750 +RMD160 68d23145d88374e4a5105bce1b38e73c1b401dfa ChangeLog 8750 +SHA256 4860ec2c7d72da020b1943b4d6a23d7ecf48b80c1f5a59f47911ce87eb88fb4c ChangeLog 8750 MISC metadata.xml 244 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d SHA1 bee870f83b6bd74feedef2b9ff8da8f4820cc19f SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d metadata.xml 244 @@ -142,19 +138,16 @@ SHA256 43e4165551f43f347ae8bd8beb5a8fe24f29c39d4273107bd541c271c89eef6c files/di MD5 d7afa3f01f843fd76f3e13e9dcac45b1 files/digest-ion3-20061223 1367 RMD160 2639e26fb415e009a08fb27b822a62fcbc5e00f7 files/digest-ion3-20061223 1367 SHA256 0a8be4455d11e16b8f4c20d6b7019d73d7e564f1a9c41134b512fd982dc675c4 files/digest-ion3-20061223 1367 -MD5 1f454e2ba54eec9e1f3fa03e307b61f6 files/digest-ion3-20070318 1045 -RMD160 7087b16c049c3b8b4d150ab7eb8a461e67ae28e6 files/digest-ion3-20070318 1045 -SHA256 b2181757e7912e1c67e67d7f3e4200e3cf9b8c4d2eea0ff964f2e92e6e3ea66d files/digest-ion3-20070318 1045 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 +MD5 d738828fdba8dec081e12431ad73be86 files/digest-ion3-20070506-r1 1331 +RMD160 2bb97783b8262b0ec65a9dcd75d359dc3ef1a2e3 files/digest-ion3-20070506-r1 1331 +SHA256 f2b7c50a3bf973359aa6e899f99fede7ebdd3698b2e93918d9f5e1306ef6ae19 files/digest-ion3-20070506-r1 1331 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFGXpgLfNMcoUhJ7GwRAj2hAKCs6DQToyzT67P2vEoqm9Vg1QRFKwCgjKaI -UBwaN+LY87P1o/R2lsgGWJQ= -=edc1 +iD8DBQFGYKMrfNMcoUhJ7GwRAqg2AKCsrpzzOqM2fHgeVKsTB1PNjSySmACeMD7j +WbuvZdLCWozF2us04f9d6cg= +=1b15 -----END PGP SIGNATURE----- diff --git a/x11-wm/ion3/files/digest-ion3-20070318 b/x11-wm/ion3/files/digest-ion3-20070318 deleted file mode 100644 index b233dc82b4c2..000000000000 --- a/x11-wm/ion3/files/digest-ion3-20070318 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 f02264ab7ecc990c2cd322f57a5e8a4d ion-3ds-20070318.tar.gz 657282 -RMD160 a7cc9baea3624b0ed840fdc82fc5db2ac1018d9a ion-3ds-20070318.tar.gz 657282 -SHA256 712da027fb12774f67d933d95a95452d98a5658617fc5515011ca79b6035258a ion-3ds-20070318.tar.gz 657282 -MD5 b6ec641eac93eb32a97de4baf02f4da0 ion3-doc-20070318.tar.bz2 38870 -RMD160 5fc0225ad23f1c96b5e979d66185ea608372297d ion3-doc-20070318.tar.bz2 38870 -SHA256 22ca643ca5df67086f12d3f106b16094017477c41fd1ebd73d30607db206821b ion3-doc-20070318.tar.bz2 38870 -MD5 4ce492ba5311d74328655923386868ee ion3-mod-xrandr-20070220.tar.bz2 10822 -RMD160 680714961af7e6b81896c4d989baded5ea4c5222 ion3-mod-xrandr-20070220.tar.bz2 10822 -SHA256 858a72ad203fb98f3cea672809a2cdfd7cb87cfa744e622e5a04d2f87cc1ae38 ion3-mod-xrandr-20070220.tar.bz2 10822 -MD5 47c6573679eead6183c49bdbc660aedd ion3-scripts-20070322.tar.bz2 101212 -RMD160 101a6dd933b5b9b495ca4607a7e0d48d48a9c409 ion3-scripts-20070322.tar.bz2 101212 -SHA256 6864d75f2f7ca021368b52051c297f5590047257ca39d0332af65c7fef0f8d39 ion3-scripts-20070322.tar.bz2 101212 diff --git a/x11-wm/ion3/files/digest-ion3-20070506 b/x11-wm/ion3/files/digest-ion3-20070506 deleted file mode 100644 index bfefeec9b528..000000000000 --- a/x11-wm/ion3/files/digest-ion3-20070506 +++ /dev/null @@ -1,15 +0,0 @@ -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/files/digest-ion3-20070506-r1 b/x11-wm/ion3/files/digest-ion3-20070506-r1 new file mode 100644 index 000000000000..bfefeec9b528 --- /dev/null +++ b/x11-wm/ion3/files/digest-ion3-20070506-r1 @@ -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-20070318.ebuild b/x11-wm/ion3/ion3-20070318.ebuild deleted file mode 100644 index dacaaafc48ba..000000000000 --- a/x11-wm/ion3/ion3-20070318.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# 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-20070318.ebuild,v 1.2 2007/03/26 16:11:50 armin76 Exp $ - -inherit eutils - -MY_PV=${PV/_p/-} -MY_PN=ion-3ds-${MY_PV} - -SCRIPTS_PV=20070322 -SCRIPTS_PN=ion3-scripts - -IONFLUX_PV=20061022 -IONFLUX_PN=ion3-mod-ionflux - -IONXRANDR_PV=20070220 -IONXRANDR_PN=ion3-mod-xrandr - -IONDOC_PV=20070318 -IONDOC_PN=ion3-doc - - -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 - doc? ( mirror://gentoo/${IONDOC_PN}-${IONDOC_PV}.tar.bz2 )" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="unicode iontruetype doc" -DEPEND=" - || ( - ( - x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - iontruetype? ( 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}" - -src_unpack() { - unpack ${A} - - cd ${S} - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" epatch - use iontruetype && epatch ${FILESDIR}/xft-ion3-${PV}.patch - - - # 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 the docpath - #sed -i system.mk build/ac/system-ac.mk.in \ - # -e "s:\(DOCDIR=@datadir@/doc/\)@PACKAGE_TARNAME@:\1${PF}:" - - cd ${S}/build/ac/ - autoreconf -i --force - - # FIX for modules - cd ${WORKDIR} - ln -s ${MY_PN} ion-3 -} - -src_compile() { - local myconf="" - - myconf="${myconf} `use_enable iontruetype xft`" - - # xfree - if has_version '>=x11-base/xfree-4.3.0'; then - myconf="${myconf} --disable-xfree86-textprop-bug-workaround" - fi - - # help out this arch as it can't handle certain shared library linkage - use hppa && myconf="${myconf} --disable-shared" - - # unicode support - use unicode && myconf="${myconf} --enable-Xutf8" - - cd build/ac/ - econf \ - ${myconf} \ - --sysconfdir=/etc/X11 \ - - cd ${S} - make \ - DOCDIR=/usr/share/doc/${PF} || die - - for i in ${MODULES} - do - cd ${WORKDIR}/${i} - - emake \ - prefix=/usr \ - ETCDIR=/etc/X11/ion3 \ - SHAREDIR=/usr/share/ion3 \ - MANDIR=/usr/share/man \ - DOCDIR=/usr/share/doc/${PF} \ - LOCALEDIR=/usr/share/locale \ - LIBDIR=/usr/lib \ - MODULEDIR=/usr/lib/ion3/mod \ - LCDIR=/usr/lib/ion3/lc \ - VARDIR=/var/cache/ion3 - done - - if ( use doc ) - then - 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)." -} diff --git a/x11-wm/ion3/ion3-20070506-r1.ebuild b/x11-wm/ion3/ion3-20070506-r1.ebuild new file mode 100644 index 000000000000..2ac50a62ea23 --- /dev/null +++ b/x11-wm/ion3/ion3-20070506-r1.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-r1.ebuild,v 1.1 2007/06/01 22:55:01 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+tuomov" +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=/usr/$(get_libdir) \ + DOCDIR=/usr/share/doc/${PF} || die + + for i in ${MODULES} + do + cd ${WORKDIR}/${i} + + make \ + LIBDIR=/usr/$(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." +} diff --git a/x11-wm/ion3/ion3-20070506.ebuild b/x11-wm/ion3/ion3-20070506.ebuild deleted file mode 100644 index dda9484a2eab..000000000000 --- a/x11-wm/ion3/ion3-20070506.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# 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." -} -- cgit v1.2.3-65-gdbad