diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog deleted file mode 100644 index c64f00ac..00000000 --- a/dev-libs/apr/ChangeLog +++ /dev/null @@ -1,685 +0,0 @@ -# ChangeLog for dev-libs/apr -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.188 2013/02/20 22:59:30 zmedico Exp $ - - 20 Feb 2013; Zac Medico apr-1.4.6-r1.ebuild: - Add ~arm-linux keyword. - - 29 Dec 2012; Sergey Popov apr-1.4.6-r1.ebuild: - Apply user patches, wrt bug #449048 - -*apr-1.4.6-r1 (28 Nov 2012) - - 28 Nov 2012; Christoph Junghans +apr-1.4.6-r1.ebuild, - +files/apr-1.4.6-mint.patch: - added prefix support - - 27 Nov 2012; Pacho Ramos metadata.xml: - Drop apache herd as discussed in http://www.gossamer- - threads.com/lists/gentoo/dev/262834 - - 09 May 2012; Alexis Ballier apr-1.4.6.ebuild: - keyword ~amd64-fbsd - -*apr-1.4.6 (28 Feb 2012) - - 28 Feb 2012; Christian Ruppert +apr-1.4.6.ebuild, - metadata.xml: - Version bump, CVE-2012-0840, bug 403731 - - 11 Nov 2011; Markos Chandras -apr-1.4.4.ebuild: - remove old ebuild - - 11 Nov 2011; Markos Chandras apr-1.4.5.ebuild: - Use EAPI=4. Add static-libs USE flag. Patch by Arfrever. - - 29 Oct 2011; Raúl Porcel apr-1.4.5.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #385859 - - 24 Oct 2011; Markus Meier apr-1.4.5.ebuild: - x86 stable, bug #385859 - - 23 Oct 2011; Markus Meier apr-1.4.5.ebuild: - arm stable, bug #385859 - - 22 Oct 2011; Kacper Kowalik apr-1.4.5.ebuild: - ppc/ppc64 stable wrt #385859 - - 19 Oct 2011; Jeroen Roovers apr-1.4.5.ebuild: - Stable for HPPA (bug #385859). - - 19 Oct 2011; Tony Vroon apr-1.4.5.ebuild: - Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian - "idella4" Delaney in security bug #385859. - -*apr-1.4.5 (07 Jul 2011) - - 07 Jul 2011; Markos Chandras +apr-1.4.5.ebuild: - Version bump. Requested by Arfrever - - 14 May 2011; Raúl Porcel apr-1.4.4.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #366903 - - 14 May 2011; Kacper Kowalik apr-1.4.4.ebuild: - ppc/ppc64 stable wrt #366903 - - 13 May 2011; Jeroen Roovers apr-1.4.4.ebuild: - Stable for HPPA (bug #366903). - - 12 May 2011; Thomas Kahle apr-1.4.4.ebuild: - x86 stable per bug 366903 - - 11 May 2011; Markos Chandras apr-1.4.4.ebuild: - Stable on amd64 wrt bug #366903 - -*apr-1.4.4 (09 May 2011) - - 09 May 2011; Arfrever Frehtes Taifersar Arahesis - +apr-1.4.4.ebuild: - Version bump. - -*apr-1.4.2-r1 (18 Feb 2011) - - 18 Feb 2011; Benedikt Böhm +apr-1.4.2-r1.ebuild, - +files/apr_ring_volatile.patch, metadata.xml: - fix UUID support (bug #320845) and gcc 4.5 support (bug #355171) - - 19 Sep 2010; Benedikt Böhm apr-1.4.2.ebuild: - fix CONFIG_SHELL wrt #335944 - - 01 Aug 2010; Raúl Porcel apr-1.4.2.ebuild: - ia64/s390/sh/sparc stable wrt #322681 - - 25 Jul 2010; Samuli Suominen apr-1.4.2.ebuild: - ppc64 stable wrt #322681 - - 25 Jul 2010; Tobias Klausmann apr-1.4.2.ebuild: - Stable on alpha, bug #322681 - - 22 Jul 2010; Markus Meier apr-1.4.2.ebuild: - arm stable, bug #322681 - - 26 Jun 2010; apr-1.4.2.ebuild: - ppc stable #322681 - - 22 Jun 2010; Jeroen Roovers apr-1.4.2.ebuild: - Stable for HPPA (bug #322681). - - 12 Jun 2010; Pawel Hajdan jr apr-1.4.2.ebuild: - x86 stable wrt bug #322681 - - 07 Jun 2010; Markos Chandras apr-1.4.2.ebuild: - Stable on amd64 wrt bug #322681 - - 02 Jun 2010; Arfrever Frehtes Taifersar Arahesis - apr-1.4.2.ebuild: - Properly fix build failure (bug #317527). - - 02 Jun 2010; Patrick Lauer apr-1.4.2.ebuild: - Fix for compilation failure, #317527. Thanks to Andrew Savchenko for the - patch - -*apr-1.4.2 (01 Apr 2010) - - 01 Apr 2010; Arfrever Frehtes Taifersar Arahesis - +apr-1.4.2.ebuild: - Version bump (bug #309625). - - 07 Mar 2010; Benedikt Böhm apr-1.3.8.ebuild, - apr-1.3.9.ebuild: - remove debug USE flag wrt #306651 - - 17 Nov 2009; Brent Baude apr-1.3.9.ebuild: - Marking apr-1.3.9 ppc64 for bug 290319 - - 14 Nov 2009; Raúl Porcel apr-1.3.9.ebuild: - arm/ia64/s390/sh/sparc stable wrt #290319 - - 08 Nov 2009; Tobias Klausmann apr-1.3.9.ebuild: - Stable on alpha, bug #290319 - - 04 Nov 2009; Arfrever Frehtes Taifersar Arahesis - apr-1.3.9.ebuild: - Use 'dohtml -r' for compatibility with Doxygen 1.6 (bug #287821). - - 01 Nov 2009; nixnut apr-1.3.9.ebuild: - ppc stable #290319 - - 30 Oct 2009; Markus Meier apr-1.3.9.ebuild: - amd64/x86 stable, bug #290319 - - 26 Oct 2009; Jeroen Roovers apr-1.3.9.ebuild: - Stable for HPPA (bug #290319). - -*apr-1.3.9 (24 Sep 2009) - - 24 Sep 2009; Arfrever Frehtes Taifersar Arahesis - +apr-1.3.9.ebuild: - Version bump. - - 20 Sep 2009; Benedikt Böhm -apr-1.3.5.ebuild, - -apr-1.3.6.ebuild, -apr-1.3.7.ebuild, apr-1.3.8.ebuild: - fix #274246; remove old ebuild - - 24 Aug 2009; Brent Baude apr-1.3.8.ebuild: - Marking apr-1.3.8 ppc64 for bug 280514 - - 23 Aug 2009; nixnut apr-1.3.8.ebuild: - ppc stable #280514 - - 14 Aug 2009; Raúl Porcel apr-1.3.8.ebuild: - arm/ia64/s390/sh/sparc stable wrt #280514 - - 11 Aug 2009; Jeroen Roovers apr-1.3.8.ebuild: - Stable for HPPA (bug #280514). - - 10 Aug 2009; Markus Meier apr-1.3.8.ebuild: - x86 stable, bug #280514 - - 10 Aug 2009; Arfrever Frehtes Taifersar Arahesis - apr-1.3.8.ebuild, metadata.xml: - Rename "cloexec" USE flag to "older-kernels-compatibility" (bug #280648). - - 10 Aug 2009; Tobias Klausmann apr-1.3.8.ebuild: - Stable on alpha, bug #280514 - - 10 Aug 2009; Tobias Klausmann ChangeLog: - Stable on alpha, bug #280514 - - 10 Aug 2009; Arfrever Frehtes Taifersar Arahesis - apr-1.3.8.ebuild, metadata.xml: - Add "cloexec" USE flag (bug #280648). - - 07 Aug 2009; Christian Faulhammer apr-1.3.8.ebuild: - revert stable keyword for x86 - - 06 Aug 2009; Markus Meier apr-1.3.8.ebuild: - x86 stable, bug #280514 - - 06 Aug 2009; Alex Legler apr-1.3.8.ebuild: - amd64 stable, security bug 280514. - -*apr-1.3.8 (06 Aug 2009) - - 06 Aug 2009; Arfrever Frehtes Taifersar Arahesis - -apr-1.2.11.ebuild, -apr-1.2.12.ebuild, -apr-1.3.0.ebuild, - -apr-1.3.2.ebuild, -apr-1.3.3.ebuild, +apr-1.3.8.ebuild: - Version bump. - -*apr-1.3.7 (24 Jul 2009) - - 24 Jul 2009; Arfrever Frehtes Taifersar Arahesis - +apr-1.3.7.ebuild: - Version bump. - -*apr-1.3.6 (07 Jul 2009) - - 07 Jul 2009; Arfrever Frehtes Taifersar Arahesis - +apr-1.3.6.ebuild: - Version bump. - - 21 Jun 2009; Brent Baude apr-1.3.5.ebuild: - Marking apr-1.3.5 ppc for bug 272260 - - 16 Jun 2009; Brent Baude apr-1.3.5.ebuild: - Marking apr-1.3.5 ppc64 for bug 272260 - - 16 Jun 2009; Raúl Porcel apr-1.3.5.ebuild: - arm/ia64/s390/sh/sparc stable wrt #272260 - - 11 Jun 2009; Tobias Klausmann apr-1.3.5.ebuild: - Stable on alpha, bug #272260 - - 11 Jun 2009; Markus Meier apr-1.3.5.ebuild: - amd64 stable, bug #272260 - - 10 Jun 2009; Christian Faulhammer apr-1.3.5.ebuild: - stable x86, security bug 272260 - - 09 Jun 2009; Jeroen Roovers apr-1.3.5.ebuild: - Stable for HPPA (bug #272260). - -*apr-1.3.5 (08 Jun 2009) - - 08 Jun 2009; Arfrever Frehtes Taifersar Arahesis - +apr-1.3.5.ebuild: - Version bump. - - 23 Jan 2009; Raúl Porcel apr-1.3.3.ebuild: - arm/ia64/s390/sh stable wrt #246003 - - 18 Jan 2009; Tobias Klausmann apr-1.3.3.ebuild: - Stable on alpha, bug #246003 - - 09 Jan 2009; Ferris McCormick apr-1.3.3.ebuild: - Sparc stable, Bug #246003. - - 09 Jan 2009; Brent Baude apr-1.3.3.ebuild: - Marking apr-1.3.3 ppc for bug 246003 - - 07 Jan 2009; Jeroen Roovers apr-1.3.3.ebuild: - Stable for HPPA (bug #246003). - - 07 Jan 2009; Brent Baude apr-1.3.3.ebuild: - Marking apr-1.3.3 ppc64 for bug 246003 - - 04 Jan 2009; Markus Meier apr-1.3.3.ebuild: - amd64/x86 stable, bug #246003 - - 25 Oct 2008; Benedikt Böhm apr-1.3.3.ebuild: - fix typo wrt #236156 - - 29 Aug 2008; Benedikt Böhm apr-1.3.3.ebuild: - defaulting to USE=urandom wrt #232951 - -*apr-1.3.3 (29 Aug 2008) - - 29 Aug 2008; Benedikt Böhm +apr-1.3.3.ebuild: - version bump wrt #235938 - - 16 Aug 2008; Jeroen Roovers apr-1.3.2.ebuild: - Stable for HPPA (bug #232671). - - 08 Aug 2008; nixnut apr-1.3.2.ebuild: - Stable on ppc wrt bug 232671 - - 08 Aug 2008; Markus Rothe apr-1.3.2.ebuild: - Stable on ppc64; bug #232671 - - 08 Aug 2008; Raúl Porcel apr-1.3.2.ebuild: - alpha/ia64/sparc/x86 stable wrt #232671 - - 07 Aug 2008; Thomas Anderson apr-1.3.2.ebuild: - stable amd64, bug 232671 - - 06 Aug 2008; Ulrich Mueller metadata.xml: - Add USE flag description to metadata wrt GLEP 56. - - 23 Jun 2008; Benedikt Böhm apr-1.3.2.ebuild: - remove unused ipv6 USE flag - -*apr-1.3.2 (23 Jun 2008) - - 23 Jun 2008; Benedikt Böhm +apr-1.3.2.ebuild: - version bump wrt #228953 - -*apr-1.3.0 (11 Jun 2008) - - 11 Jun 2008; Benedikt Böhm +apr-1.3.0.ebuild: - version bump wrt #225783 - - 01 Jun 2008; Benedikt Böhm apr-1.2.11.ebuild, - apr-1.2.12.ebuild: - fix #221653 - - 28 Jan 2008; Benedikt Böhm - -files/apr-0.9.12-linking.patch, -apr-0.9.12.ebuild, -apr-0.9.13.ebuild: - remove apr-0 wrt #203578 - -*apr-1.2.12 (15 Dec 2007) - - 15 Dec 2007; Benedikt Böhm -apr-1.2.8.ebuild, - -apr-1.2.9.ebuild, +apr-1.2.12.ebuild: - version bump; #200947 - - 16 Nov 2007; nixnut apr-1.2.11.ebuild: - Stable on ppc wrt bug 198866 - - 16 Nov 2007; Raúl Porcel apr-1.2.11.ebuild: - alpha/ia64 stable wrt #198866 - - 15 Nov 2007; Steve Dibb apr-1.2.11.ebuild: - amd64 stable, bug 198866 - - 13 Nov 2007; Dawid Węgliński apr-1.2.11.ebuild: - Stable on x86 (bug #198866) - - 13 Nov 2007; Markus Rothe apr-1.2.11.ebuild: - Stable on ppc64; bug #198866 - - 13 Nov 2007; Jeroen Roovers apr-1.2.11.ebuild: - Stable for HPPA (bug #198866). - - 12 Nov 2007; Ferris McCormick apr-1.2.11.ebuild: - Sparc stable --- Bug #198866 --- Good for two months. - - 09 Sep 2007; Benedikt Böhm apr-1.2.11.ebuild: - fix #188485 - -*apr-1.2.11 (08 Sep 2007) - - 08 Sep 2007; Benedikt Böhm +apr-1.2.11.ebuild: - version bump; #191733 - - 31 Jul 2007; Christian Heim apr-1.2.9.ebuild: - The version bump wasn't designed to go straight to stable. - -*apr-1.2.9 (30 Jul 2007) - - 30 Jul 2007; Benedikt Böhm +apr-1.2.9.ebuild: - version bump - - 27 Jun 2007; Lars Weiler apr-1.2.8.ebuild: - Stable on ppc; bug #178264. - - 27 Jun 2007; Jeroen Roovers apr-1.2.8.ebuild: - Stable for HPPA (bug #178264). - - 15 Jun 2007; Raúl Porcel apr-1.2.8.ebuild: - alpha stable wrt #178264 - - 13 Jun 2007; Gustavo Zacarias apr-1.2.8.ebuild: - Stable on sparc wrt #178264 - - 21 Apr 2007; Raúl Porcel apr-1.2.8.ebuild: - ia64 stable - - 15 Apr 2007; Markus Rothe apr-1.2.8.ebuild: - Stable on ppc64 - - 12 Apr 2007; Christian Faulhammer apr-1.2.8.ebuild: - stable amd64, bug 168287 - - 11 Apr 2007; Christian Heim apr-1.2.8.ebuild: - Fix WANT_AUTO*, according to #172978. - - 03 Mar 2007; Marius Mauch apr-0.9.12.ebuild, - apr-0.9.13.ebuild: - Replacing einfo with elog - - 25 Feb 2007; Christian Faulhammer apr-1.2.8.ebuild: - stable x86; bug 168287 - - 29 Jan 2007; Christian Heim apr-0.9.13.ebuild: - Reverting the KEYWORDS to ~arch, accidently commited straight to arch. - -*apr-0.9.13 (28 Jan 2007) - - 28 Jan 2007; Christian Heim +apr-0.9.13.ebuild: - Version bump, new upstream version. Cleaning up the ebuild a bit. - - 28 Jan 2007; Luca Longinotti metadata.xml, - -apr-0.9.6-r3.ebuild, -apr-0.9.6-r4.ebuild, -apr-0.9.7.ebuild, - -apr-1.2.2.ebuild, -apr-1.2.7.ebuild, -apr-1.2.7-r1.ebuild, - -apr-1.2.7-r2.ebuild, -apr-1.2.7-r3.ebuild: - Remove redundant versions. - -*apr-1.2.8 (21 Jan 2007) - - 21 Jan 2007; Christian Heim +apr-1.2.8.ebuild: - Version bump (thanks to Conrad Kostecki in #114232). - - 08 Jan 2007; Christian Heim apr-1.2.7-r1.ebuild, - apr-1.2.7-r2.ebuild, apr-1.2.7-r3.ebuild: - Setting WANT_AUTOCONF to shutup #161027. - - 18 Oct 2006; Roy Marples apr-0.9.12.ebuild: - Added ~sparc-fbsd keyword. - - 18 Oct 2006; Roy Marples apr-1.2.7-r3.ebuild: - Added ~sparc-fbsd keyword. - - 15 Oct 2006; Michael Stewart apr-0.9.12.ebuild, - apr-1.2.7-r3.ebuild: - Remove apr.exp as it's not used and causes collisions between SLOTs - - 10 Sep 2006; Javier Villavicencio - apr-1.2.7-r3.ebuild: - Add ~x86-fbsd keyword. - - 05 Sep 2006; Joshua Kinard apr-0.9.12.ebuild: - Marked stable on mips. - - 29 Jul 2006; Bryan Østergaard apr-0.9.12.ebuild: - Stable on alpha. - -*apr-1.2.7-r3 (07 Jul 2006) - - 07 Jul 2006; Michael Stewart - +files/config.layout.patch, +apr-1.2.7-r3.ebuild: - Use a config.layout instead of command line options to work around bug 139033. - - 28 Jun 2006; Tobias Scherbaum apr-0.9.12.ebuild: - ppc stable, #138011 - - 28 Jun 2006; Joshua Jackson apr-0.9.12.ebuild: - Stable x86; buf #138011 - - 27 Jun 2006; Marcus D. Hanwell apr-0.9.12.ebuild: - Marked stable on amd64, bug 138011. - - 27 Jun 2006; Guy Martin apr-0.9.12.ebuild: - Stable on hppa. - - 26 Jun 2006; Markus Rothe apr-0.9.12.ebuild: - Stable on ppc64; bug #138011 - - 26 Jun 2006; Gustavo Zacarias apr-0.9.12.ebuild: - Stable on sparc wrt #138011 - -*apr-1.2.7-r2 (07 Jun 2006) - - 07 Jun 2006; Michael Stewart +apr-1.2.7-r2.ebuild: - Always enable ipv6. Fixes bug 123320. - - 06 Jun 2006; Michael Stewart apr-1.2.7.ebuild: - Remove as-needed filtering - - 05 Jun 2006; Michael Stewart - +files/apr-0.9.12-linking.patch, apr-0.9.12.ebuild: - Add patch to allow correct linking with --as-needed - - 04 Jun 2006; Michael Stewart apr-1.2.7-r1.ebuild: - Remove hardcoding of .m4 files from configure.in. Fixes bug 135463 - -*apr-1.2.7-r1 (26 May 2006) - - 26 May 2006; Michael Stewart +apr-1.2.7-r1.ebuild: - Use the system's libtool instead of the bundled libtool. Fixes bug 81260 - Note that some software that hardcodes the APR libtool location (such as - Apache) may need to be recompiled. - - 18 May 2006; Michael Stewart apr-0.9.12.ebuild, - apr-1.2.7.ebuild: - Fix sem_open related sandbox violations. Resolves bug 133573. - -*apr-0.9.12 (16 Apr 2006) - - 16 Apr 2006; Michael Stewart +apr-0.9.12.ebuild: - Version bump - -*apr-1.2.7 (16 Apr 2006) - - 16 Apr 2006; Michael Stewart +apr-1.2.7.ebuild: - Version bump in preperation for the next version of apache 2.2.x - - 30 Mar 2006; Diego Pettenò apr-0.9.7.ebuild: - Add ~x86-fbsd keyword. - -*apr-1.2.2 (15 Feb 2006) - - 15 Feb 2006; Michael Stewart +apr-1.2.2.ebuild: - New version for apache 2.2 - - 15 Jan 2006; Marcus D. Hanwell apr-0.9.7.ebuild: - Stable on amd64, bug 117835. - - 13 Jan 2006; Tobias Scherbaum apr-0.9.7.ebuild: - ppc stable, bug #117835 - - 12 Jan 2006; Markus Rothe apr-0.9.7.ebuild: - Stable on ppc64; bug #117835 - - 10 Jan 2006; Gustavo Zacarias apr-0.9.7.ebuild: - Stable on sparc wrt #117835 - - 09 Jan 2006; Bryan Østergaard +apr-0.9.7.ebuild: - Version Bump - - 21 Oct 2005; Aaron Walker apr-0.9.6-r3.ebuild: - Stable on mips. - - 10 Oct 2005; Danny van Dyk apr-0.9.6-r4.ebuild: - Marked ~ppc-macos. - - 29 Sep 2005; MATSUU Takuto apr-0.9.6-r3.ebuild: - Stable on sh. - - 19 Sep 2005; Michael Hanselmann apr-0.9.6-r3.ebuild: - Stable on hppa and ppc. - - 18 Sep 2005; Marcus D. Hanwell apr-0.9.6-r3.ebuild: - Stable on amd64, bug 105516. - - 18 Sep 2005; Jason Wever apr-0.9.6-r3.ebuild: - Added ~sparc keyword wrt bug #105516. - - 18 Sep 2005; Michael Stewart -apr-0.9.5.ebuild, - -apr-0.9.5-r1.ebuild, -apr-0.9.5-r2.ebuild, -apr-0.9.5-r3.ebuild, - -apr-0.9.6.ebuild, -apr-0.9.6-r1.ebuild, -apr-0.9.6-r2.ebuild: - Removing old revisions that use broken LFS-support - -*apr-0.9.6-r4 (17 Sep 2005) - - 17 Sep 2005; Michael Stewart +apr-0.9.6-r4.ebuild: - Added support for using /dev/urandom instead of /dev/random if the urandom - USE-flag is set. Fixes bug 102587 - - 17 Sep 2005; Aron Griffis apr-0.9.6-r3.ebuild: - Mark 0.9.6-r3 stable on ia64 - - 11 Sep 2005; Markus Rothe apr-0.9.6-r3.ebuild: - Stable on ppc64 - - 10 Sep 2005; Aron Griffis apr-0.9.6-r3.ebuild: - Mark 0.9.6-r3 stable on alpha - - 10 Sep 2005; Michael Stewart apr-0.9.6-r3.ebuild: - Stable on x86 - - 10 Sep 2005; Aron Griffis apr-0.9.5.ebuild: - Mark 0.9.5 stable on alpha - - 17 Jul 2005; Kito apr-1.1.1.ebuild: - ~ppc-macos Keyword - - 13 Jul 2005; bret curtis apr-1.1.1.ebuild apr-0.9.6-r3: - added ~mips - - 10 May 2005; Bret Curtis apr-0.9.5.ebuild: - marked for testing, ~mips - -*apr-0.9.6-r3 (09 May 2005) -*apr-0.9.5-r3 (09 May 2005) - - 09 May 2005; Elfyn McBratney +apr-0.9.5-r3.ebuild, - +apr-0.9.6-r3.ebuild: - Rev bumps that remove LFS support from APR (has caused too many issues for - mid-release introduction). The Apache tool-stack (net-www/apache, - devs-libs/apr (this package) and dev-libs/apr-util) will need to be rebuilt - once emerging this update. - -*apr-1.1.1 (10 Apr 2005) - - 10 Apr 2005; Christian Parpart +apr-1.1.1.ebuild: - adding apr-1 (1.1.1) ebuilds to the series of apr versions which is the base - requirement for forthcoming apache httpd 2.1.x series ;) - - 31 Mar 2005; Aron Griffis apr-0.9.5.ebuild: - stable on ia64 - - 21 Mar 2005; Elfyn McBratney apr-0.9.5-r2.ebuild, - apr-0.9.6-r2.ebuild: - Add elibtoolize call for bug #77455. - -*apr-0.9.6-r2 (14 Mar 2005) - - 14 Mar 2005; Elfyn McBratney +apr-0.9.5-r2.ebuild, - +apr-0.9.6-r2.ebuild: - Rev bumps which specify which random device node (--with-devrandom) to use. - These two are hard masked in case this changes breaks stuff. - - 14 Mar 2005; Elfyn McBratney apr-0.9.5-r1.ebuild, - apr-0.9.5.ebuild: - Drop extranous 'ipv6' arg to use_enable. - - 05 Mar 2005; Markus Rothe apr-0.9.5.ebuild: - Stable on ppc64 - -*apr-0.9.6-r1 (05 Mar 2005) - - 05 Mar 2005; Elfyn McBratney +apr-0.9.5-r1.ebuild, - +apr-0.9.6-r1.ebuild: - LFS-enabled apr breaks Apache on sparc; disabling until fixed. - - 03 Mar 2005; Elfyn McBratney -apr-0.9.2.ebuild, - -apr-0.9.4.ebuild: - Remove old versions. - -*apr-0.9.6 (02 Mar 2005) - - 02 Mar 2005; Elfyn McBratney +apr-0.9.6.ebuild: - Version bump. - - 28 Feb 2005; Jeremy Huddleston apr-0.9.5.ebuild: - Killed einstall usage. Back to using econf to fix multilib problems. - - 20 Feb 2005; Aron Griffis apr-0.9.5.ebuild: - add ~ia64 #77455 - - 05 Feb 2005; Bryan Østergaard apr-0.9.5.ebuild: - ~alpha keyword, bug 77455. - - 28 Jan 2005; Michael Hanselmann apr-0.9.5.ebuild: - Added to ~ppc. - - 11 Jan 2005; Mike Doty apr-0.9.5.ebuild: - ~amd64 keyword added, bug 77455 - - 11 Jan 2005; Guy Martin apr-0.9.5.ebuild: - Added ~hppa to KEYWORDS. - - 11 Jan 2005; Markus Rothe apr-0.9.5.ebuild: - Added ~ppc64 to KEYWORDS - - 10 Jan 2005; Jason Wever apr-0.9.5.ebuild: - Added ~sparc keyword wrt bug #77455. - -*apr-0.9.5 (08 Jan 2005) - - 08 Jan 2005; Michael Stewart +metadata.xml, - +apr-0.9.5.ebuild: - Apache herd package refresh - - 22 Jul 2004; David Holm apr-0.9.4.ebuild: - Added to ~ppc. - - 20 Apr 2004; Daniel Black apr-0.9.2.ebuild: - QA - removed runtime dependance on autoconf and automake. More dependancy work - required - - 16 Apr 2004; Jason Wever apr-0.9.4.ebuild: - Added ~sparc keyword. - - 14 Mar 2004; Michael Sterrett apr-0.9.2.ebuild, - apr-0.9.4.ebuild: - Don't assign default to S; header fix - - 09 Feb 2004; Dylan Carlson apr-0.9.4.ebuild: - added amd64 keyword. - -*apr-0.9.4 (13 Oct 2003) - - 13 Oct 2003; Martin Holzer apr-0.9.4.ebuild: - Version bumped. Ebuild submitted by - Hattya in #30810. - -*apr-0.9.2 (29 Mar 2003) - - 29 Mar 2003; Dylan Carlson apr-0.9.2.ebuild: - Initial import. diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest deleted file mode 100644 index 45285592..00000000 --- a/dev-libs/apr/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -AUX apr-1.4.5-xattr-build-1.patch 5932 SHA256 f1d4cfe011c0e0e507f5bda965f78cbe2884249b06f231d8c7b7252be49ab0ff SHA512 eab5ca3b60feffb359b03a2d5a396a4c3533ffe1148abf9e250b76c2740631f91c990e008775ff9074139015d835d1f93820dd3cfc434c0f4a8f3daf7858facf WHIRLPOOL 26589926dd6a3120a5e9a9207e1aa43c69758be36fd007065fd2e7adfd3dce944ae44d7db35d3351975b90c3b3fbf0b4121949ff3ad129f6858d8be89baefccf -AUX apr-1.4.6-mint.patch 1200 SHA256 d1d8217efbf87f136ece47d06e224f23a585b1634d70a911c88778b8503b3d71 SHA512 531961bcd79850a4b6af59288a6aeb489632d64fd4a1bed80450d48e48f5ff3ea7c0d1e05d80a591c2d8d1a2c6f0c859ef8500b1f01614d83df74034782fd7bd WHIRLPOOL 52c98387ed240f94099f4587734b048fdc6899309d5b4b2f5b237fc7621ef5aa81f1a8b6602e7589ec55fbf391104db3e4451e62dbabdc55133530830dddecf1 -AUX apr-xattr-build.patch 5530 SHA256 ccda7d84d0a4c95507e82bcbf157dca91e420e7825c80cbd60894d2b047b2b1d SHA512 a7f8d2791222190302270f0a34412799f572e0230cc7687b2858c9143202b991da8c3f2f917a33016407092027797d79fa219535d8182236e33c387f6dd23b20 WHIRLPOOL 86320f68430097dac6cf84bf5a5acc2da61be639b79c54309ab3d8cc57b3b60fc8f8c79c1750a81636c3c1ceb428fbe9d66f274c2b26f2e260a7568b3cda7f8b -AUX apr-xattr-headers.patch 13791 SHA256 0d7068d1738dd2bedd8fffe7e95f0089e70b9730a81d35b2688c50e506f718ee SHA512 4ea5e37c7bfab2d44e9bdaf6cc32999e9f522a3516d2a284526f0198353636afc83bf62bd51eab4795cafa574dd59d8e1bf035c29a594a490f36c99696cebb04 WHIRLPOOL 54be7601b4b4325c4964ad3b6a33e8d2f35205631e3ac5f601c5e36d9f11143609171dc741d7ff98b24d59a285f3b3f33f109427e9c7419bf02c407fde8aa017 -AUX apr-xattr-impl.patch 38289 SHA256 3998baaad273f88bf3d82cf6522d7da88a5d03ffbc75bd5c781e1142b010fa13 SHA512 11c7773593808499d890d5ceaf813bed0ac0b213efc2dba4d9e3fb2866d930e5d43aab08ac45ee7c69327345afda25e93275274a05d8427e700966b8e7ef672d WHIRLPOOL 374652f300b307cc669dd9a0d7804a39cc3cbfd82c43121505829d6a8600a23abacc6a2fadcade18db8ca5e7d46a1d63b59f481b15c31934eb5eec80883c1b1a -AUX apr-xattr-tests.patch 17458 SHA256 14b0b7750c795734a1e71688e084c08e8af6db83acab0f8b135f08cfa92c080e SHA512 3482bc272225072121ab902f1fb95a2ba15ce38c37449ee78ac0e9450df60e1a292a02613b7d55060233dab214d88dc615e72b876fb68d3d1c8f9cb140178684 WHIRLPOOL 1246086a29aebc1faf745a6bff93ca79d7f6ee99dea8710ce87f0cc53711227d25e2c3c118ffe2da498fc416cb507e98e76ac1a350e93c08e380c3be1809516a -AUX apxattr.c 5948 SHA256 2e758eb18056cc619acaea550c8fd724f90d39f4b3fe29ab801d3eeaccf7164c SHA512 bf767cd448d6e7b4e945e43b5843825e0a7f8b0475a0fb0cd34d0844b17d19e37a5ac47ba8afa4b095b3aa39a6e1a34b1f81a91313768a2fabd63d135bdad552 WHIRLPOOL 1af5fcd3e3d2a1527be08f6105d3d554c6c57944f8740ba6fb1bebe8c4d2dde0be153af1e41a0ff7d7afcf29948e9b70f63726f967067b3adb233d85d5d158e3 -AUX config.layout.patch 818 SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181 SHA512 4ff9a98c2a799c714d3b4c2cb42dd9c1cd6aa52b465570939710c0ac5800ea8806a9c38500d83b09a2bf61984d57c53ae934886d9f25e3111d721ef282a7d91e WHIRLPOOL a03f7e889a416ada14c62ca99727e2c8cba403972785c7d2282c1c914abe9c38a94b98489ec840b3c1e2cfc2af87ee08ac724d0434e8198596f7d2b44907d3db -DIST apr-1.4.6.tar.bz2 785724 SHA256 9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc SHA512 1842e2dfc9315d9dd39acd4545d80fad45dcb419c9bfb4423453ca8727aa78d864fd48f43e68a696345b4c0ee2e9eb50b3eddd96d3eaf6ed3c5d48211831b8e4 WHIRLPOOL 4d8a67dace2b7e1c41c778ad3d34f4a479f9885c0b11cd3c4be412da4e2e006765802f8756a52d97fbfe4e962302274fe0e67cd1b8ac1a673044e79fbec5dc6e -EBUILD apr-1.4.6-r1.ebuild 3812 SHA256 77bd785fcac4701619964dd3a591f1425883c8cf72009eb6b57c4e2fc26d87f2 SHA512 3a6164026d9c0bc993204b27c6523c3ede68ca6db0b788f774b8a60dc7d35c8b709c49d6a47f0ddb509c5de907f7e7f7e534a4fcba7978a18ad662fc4c24014a WHIRLPOOL 410dd3764ba610ff21e4dacb3451cd8dfe1c565d4ad81348099ad52c2d7eb61594ed281b2f50b8feb9f03da5c7dad6969830d1350e6b3a52c17947129671385d -MISC ChangeLog 22587 SHA256 9e25a38817bfd2ddf73e7c58b0b5c810a181b979d56f3f6a02e48d10efd163b9 SHA512 22a3c518acc3d66e3747f29420002a87ab192262a32b9323837303595e7e75df84e5e6e7940155bd033a832ddf7b860050184373b857f47228d2534c671d3263 WHIRLPOOL 268dd78f0b96b2bded481955dd392d979b0772604a71e88482d2ce45286e152e2baaddcf7d982b611238f265a30979412096a250836a92e2856a3cb128966df5 -MISC metadata.xml 443 SHA256 966327337370abc0213bdd1e4fc8723db10871adad7746e07e9b1ebaed188212 SHA512 b46c129b23e4ba9a27be4cf0592a80223726a38d022916a4032a00dc5ca117a15641003ecb302eed6a560c73515aa990800b80b1b48574fb58235ce8bafb5b4c WHIRLPOOL 48326ff95f79a6ddcdea9a915803497bc5a510503ee5bd91d2b7d4f5d113167784f9bdca9962b083395dbc2916846f8dbadce411dcc27a207ae211cba5a1c1e0 diff --git a/dev-libs/apr/apr-1.4.6-r1.ebuild b/dev-libs/apr/apr-1.4.6-r1.ebuild deleted file mode 100644 index c0b26fe6..00000000 --- a/dev-libs/apr/apr-1.4.6-r1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.6-r1.ebuild,v 1.3 2013/02/20 22:59:30 zmedico Exp $ - -EAPI="4" - -inherit autotools eutils libtool multilib toolchain-funcs - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom +uuid" - -RDEPEND="uuid? ( - elibc_glibc? ( >=sys-apps/util-linux-2.16 ) - elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) -)" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -DOCS=(CHANGES NOTICE README) - -src_prepare() { - epatch "${FILESDIR}"/${P}-mint.patch - epatch "${FILESDIR}/apr-1.4.5-xattr-build-1.patch" - epatch "${FILESDIR}/apr-xattr-headers.patch" - epatch "${FILESDIR}/apr-xattr-impl.patch" - epatch "${FILESDIR}/apr-xattr-tests.patch" - - # Ensure that system libtool is used. - local g= - [[ ${CHOST} == *-darwin* ]] && g=g - sed -e 's:${installbuilddir}/libtool:'"${EPREFIX}/usr/bin/${g}libtool"':' -i apr-config.in || die "sed failed" - sed -e 's:@LIBTOOL@:$(SHELL) '"${EPREFIX}/usr/bin/${g}libtool"':' -i build/apr_rules.mk.in || die "sed failed" - - # Apply user patches, bug #449048 - epatch_user - - ./buildconf - AT_M4DIR="build" eautoreconf - elibtoolize - - epatch "${FILESDIR}/config.layout.patch" -} - -src_configure() { - local myconf - - [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no - - if use older-kernels-compatibility; then - local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec - export apr_cv_accept4="no" - export apr_cv_dup3="no" - export apr_cv_epoll_create1="no" - export apr_cv_sock_cloexec="no" - fi - - if use urandom; then - myconf+=" --with-devrandom=/dev/urandom" - elif (( ${CHOST#*-hpux11.} <= 11 )); then - : # no /dev/*random on hpux11.11 and before, $PN detects this. - else - myconf+=" --with-devrandom=/dev/random" - fi - - if [[ ${CHOST} == *-mint* ]] ; then - myconf+=" --disable-dso" - fi - - # shl_load does not search runpath, but hpux11 supports dlopen - [[ ${CHOST} == *-hpux11* ]] && myconf="${myconf} --enable-dso=dlfcn" - - if [[ ${CHOST} == *-solaris2.10 ]]; then - case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in - *atomic_cas_ptr*) ;; - *) - elog "You do not have Solaris Patch ID "$( - [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885 - )" (Problem 4954703) installed on your host ($(hostname))," - elog "using generic atomic operations instead." - myconf="${myconf} --disable-nonportable-atomics" - ;; - esac - fi - - if ! use uuid; then - local apr_cv_osuuid - export apr_cv_osuuid="no" - fi - - CONFIG_SHELL="${EPREFIX}"/bin/bash econf \ - --enable-layout=gentoo \ - --enable-nonportable-atomics \ - --enable-threads \ - ${myconf} - - rm -f libtool -} - -src_compile() { - emake - $(tc-getCC) ${CFLAGS} -lpthread ${LDFLAGS} -L.libs/ -Iinclude "${FILESDIR}"/apxattr.c -pthread -lapr-1 -o apxattr || die "lsprint compile failed" - - - - if use doc; then - emake dox - fi -} - -src_install() { - default - - find "${ED}" -name "*.la" -exec rm -f {} + - - if use doc; then - dohtml -r docs/dox/html/* - fi - - if ! use static-libs; then - find "${ED}" -name "*.a" -exec rm -f {} + - fi - - dobin apxattr - - # This file is only used on AIX systems, which Gentoo is not, - # and causes collisions between the SLOTs, so remove it. - # Even in Prefix, we don't need this on AIX. - rm -f "${ED}usr/$(get_libdir)/apr.exp" -} diff --git a/dev-libs/apr/files/apr-1.4.5-xattr-build-1.patch b/dev-libs/apr/files/apr-1.4.5-xattr-build-1.patch deleted file mode 100644 index 856b67f1..00000000 --- a/dev-libs/apr/files/apr-1.4.5-xattr-build-1.patch +++ /dev/null @@ -1,159 +0,0 @@ -Submitted By: Mario Fetka (mario dot fetka at gmail dot com) -Date: 2011-11-21 -Initial Package Version: 1.4.5 -Origin: http://privsep.org/patches/2.3.0-dev/xattr-patches/apr-xattr-build.patch -Upstream Status: unknown -Description: build infrastructure - -diff -Naur apr-1.4.5.orig/build.conf apr-1.4.5/build.conf ---- apr-1.4.5.orig/build.conf 2011-11-21 18:38:28.659217726 +0000 -+++ apr-1.4.5/build.conf 2011-11-21 18:39:17.735760998 +0000 -@@ -13,7 +13,7 @@ - # directories that have platform-specific code in them. the resulting - # pattern will be: SUBDIR/PLATFORM/*.c - platform_dirs = -- dso file_io locks memory misc mmap network_io poll random -+ dso file_io locks memory misc mmap network_io poll random xattr - shmem support threadproc time user atomic - - # all the public headers -diff -Naur apr-1.4.5.orig/configure.in apr-1.4.5/configure.in ---- apr-1.4.5.orig/configure.in 2011-11-21 18:38:28.985607639 +0000 -+++ apr-1.4.5/configure.in 2011-11-21 18:43:25.981912296 +0000 -@@ -197,7 +197,7 @@ - DEFAULT_OSDIR="unix" - echo "(Default will be ${DEFAULT_OSDIR})" - --apr_modules="file_io network_io threadproc misc locks time mmap shmem user memory atomic poll support random" -+apr_modules="file_io network_io threadproc misc locks time mmap shmem user memory atomic poll support random xattr" - - dnl Checks for programs. - AC_PROG_MAKE_SET -@@ -1466,7 +1466,9 @@ - sys/types.h \ - sys/uio.h \ - sys/un.h \ -- sys/wait.h) -+ sys/wait.h \ -+ sys/xattr.h \ -+ sys/extattr.h) - - # IRIX 6.5 has a problem in which prevents it from - # being included by itself. Check for manually, -@@ -1518,6 +1520,8 @@ - AC_SUBST(unistdh) - AC_SUBST(signalh) - AC_SUBST(sys_waith) -+AC_SUBST(sys_xattrh) -+AC_SUBST(sys_extattrh) - AC_SUBST(processh) - AC_SUBST(pthreadh) - AC_SUBST(semaphoreh) -@@ -2472,6 +2476,87 @@ - APR_CHECK_DIRENT_INODE - APR_CHECK_DIRENT_TYPE - -+dnl ----------------------------- Checking for Extended Attributes Support -+echo "${nl}Checking for Extended Attributes Support..." -+ -+# Check whether Extended Attributes have explicitly been disabled -+AC_ARG_ENABLE(xattr, -+ [ --disable-xattr Disable Extended Attributes support in APR.], -+ [ if test "$enableval" = "no"; then -+ user_disabled_xattr=1 -+ fi ], -+ [ user_disabled_xattr=0 ] ) -+ -+xattrdarwin="0" -+xattrlinux="0" -+xattrfreebsd="0" -+xattrsolaris="0" -+if test "$user_disabled_xattr" = 1; then -+ echo "no -- disabled by user" -+else -+ AC_CHECK_FUNCS([fgetxattr fsetxattr flistxattr fremovexattr lgetxattr \ -+ extattr_get_fd extattr_set_fd extattr_list_fd \ -+ extattr_delete_fd openat unlinkat]) -+ APR_CHECK_DEFINE(O_XATTR, sys/fcntl.h) -+ APR_CHECK_DEFINE(XATTR_NOFOLLOW, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_CREATE, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_REPLACE, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_NAME_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_SIZE_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_LIST_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_MAXNAMELEN, sys/xattr.h) -+ APR_CHECK_DEFINE(EXTATTR_NAMESPACE_USER, sys/extattr.h) -+ APR_CHECK_DEFINE(EXTATTR_NAMESPACE_SYSTEM, sys/extattr.h) -+ APR_CHECK_DEFINE(EXTATTR_MAXNAMELEN, sys/extattr.h) -+ -+ APR_BEGIN_DECISION([xattr attribute system interface]) -+ APR_IFALLYES(header:sys/xattr.h dnl -+ define:XATTR_NOFOLLOW dnl -+ func:fgetxattr dnl -+ func:fsetxattr dnl -+ func:flistxattr dnl -+ func:fremovexattr, -+ [xattrdarwin="1" -+ APR_DECIDE(USE_XATTR_DARWIN, [xattr (Darwin)])]) -+ -+ APR_IFALLYES(header:sys/xattr.h dnl -+ func:lgetxattr dnl -+ func:fgetxattr dnl -+ func:fsetxattr dnl -+ func:flistxattr dnl -+ func:fremovexattr, -+ [xattrlinux="1" -+ APR_DECIDE(USE_XATTR_LINUX, [xattr (Linux)])]) -+ -+ APR_IFALLYES(header:sys/extattr.h dnl -+ func:extattr_set_fd dnl -+ func:func:extattr_get_fd dnl -+ func:extattr_list_fd dnl -+ func:func:extattr_delete_fd, -+ [xattrfreebsd="1" -+ APR_DECIDE(USE_XATTR_FREEBSD, [extattr (FreeBSD)])]) -+ -+ APR_IFALLYES(define:O_XATTR dnl -+ func:openat dnl -+ func:unlinkat, -+ [xattrsolaris="1" -+ APR_DECIDE(USE_XATTR_SOLARIS, [attropen (Solaris)])]) -+ -+ if test "x$ac_decision" = "x"; then -+ ac_decision="USE_XATTR_NONE" -+ ac_decision_msg="no xattr interface available" -+ fi -+ APR_END_DECISION -+ AC_DEFINE_UNQUOTED($ac_decision) -+fi -+ -+if test "$xattrdarwin$xattrlinux$xattrfreebsd$xattrsolaris" = "0000"; then -+ xattr="0" -+else -+ xattr="1" -+fi -+AC_SUBST(xattr) -+ - dnl ----------------------------- Checking for UUID Support - echo "${nl}Checking for OS UUID Support..." - -diff -Naur apr-1.4.5.orig/include/apr.h.in apr-1.4.5/include/apr.h.in ---- apr-1.4.5.orig/include/apr.h.in 2011-11-21 18:38:28.661532544 +0000 -+++ apr-1.4.5/include/apr.h.in 2011-11-21 18:40:23.666523955 +0000 -@@ -104,6 +104,8 @@ - #define APR_HAVE_SYS_UIO_H @sys_uioh@ - #define APR_HAVE_SYS_UN_H @sys_unh@ - #define APR_HAVE_SYS_WAIT_H @sys_waith@ -+#define APR_HAVE_SYS_XATTR_H @sys_xattrh@ -+#define APR_HAVE_SYS_EXTATTR_H @sys_extattrh@ - #define APR_HAVE_TIME_H @timeh@ - #define APR_HAVE_UNISTD_H @unistdh@ - #define APR_HAVE_WINDOWS_H @windowsh@ -@@ -276,6 +278,7 @@ - #define APR_HAS_UNICODE_FS @have_unicode_fs@ - #define APR_HAS_PROC_INVOKED @have_proc_invoked@ - #define APR_HAS_USER @apr_has_user@ -+#define APR_HAS_XATTR @xattr@ - #define APR_HAS_LARGE_FILES @aprlfs@ - #define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@ - #define APR_HAS_OS_UUID @osuuid@ diff --git a/dev-libs/apr/files/apr-1.4.6-mint.patch b/dev-libs/apr/files/apr-1.4.6-mint.patch deleted file mode 100644 index 43442da9..00000000 --- a/dev-libs/apr/files/apr-1.4.6-mint.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur apr-1.2.11/build/apr_hints.m4 apr-1.2.11-mint/build/apr_hints.m4 ---- apr-1.2.11/build/apr_hints.m4 Tue Jun 26 23:47:46 2007 -+++ apr-1.2.11-mint/build/apr_hints.m4 Tue Mar 25 12:00:14 2008 -@@ -44,8 +44,9 @@ - - case "$host" in - *mint) -- APR_ADDTO(CPPFLAGS, [-DMINT]) -- APR_ADDTO(LIBS, [-lportlib]) -+ APR_ADDTO(CPPFLAGS, [-DMINT -D_GNU_SOURCE]) -+ apr_cv_pthreads_cflags="none" -+ apr_cv_pthreads_lib="-lpthread" - ;; - *MPE/iX*) - APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE]) -diff -ur apr-1.2.11/build/apr_threads.m4 apr-1.2.11-mint/build/apr_threads.m4 ---- apr-1.2.11/build/apr_threads.m4 Thu Aug 3 11:05:26 2006 -+++ apr-1.2.11-mint/build/apr_threads.m4 Wed Mar 19 08:38:56 2008 -@@ -198,7 +198,7 @@ - AC_DEFUN(APR_CHECK_SIGWAIT_ONE_ARG,[ - AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[ - AC_TRY_COMPILE([ --#if defined(__NETBSD__) || defined(DARWIN) -+#if defined(__NETBSD__) || defined(DARWIN) || defined(MINT) - /* When using the unproven-pthreads package, we need to pull in this - * header to get a prototype for sigwait(). Else things will fail later - * on. XXX Should probably be fixed in the unproven-pthreads package. diff --git a/dev-libs/apr/files/apr-xattr-build.patch b/dev-libs/apr/files/apr-xattr-build.patch deleted file mode 100644 index f815acdb..00000000 --- a/dev-libs/apr/files/apr-xattr-build.patch +++ /dev/null @@ -1,155 +0,0 @@ -Index: include/apr.h.in -=================================================================== ---- include/apr.h.in (revision 606453) -+++ include/apr.h.in (working copy) -@@ -103,6 +103,8 @@ - #define APR_HAVE_SYS_UIO_H @sys_uioh@ - #define APR_HAVE_SYS_UN_H @sys_unh@ - #define APR_HAVE_SYS_WAIT_H @sys_waith@ -+#define APR_HAVE_SYS_XATTR_H @sys_xattrh@ -+#define APR_HAVE_SYS_EXTATTR_H @sys_extattrh@ - #define APR_HAVE_TIME_H @timeh@ - #define APR_HAVE_UNISTD_H @unistdh@ - #define APR_HAVE_WINDOWS_H @windowsh@ -@@ -238,6 +240,7 @@ - #define APR_HAS_UNICODE_FS @have_unicode_fs@ - #define APR_HAS_PROC_INVOKED @have_proc_invoked@ - #define APR_HAS_USER 1 -+#define APR_HAS_XATTR @xattr@ - #define APR_HAS_LARGE_FILES @aprlfs@ - #define APR_HAS_XTHREAD_FILES 0 - #define APR_HAS_OS_UUID @osuuid@ -Index: configure.in -=================================================================== ---- configure.in (revision 606453) -+++ configure.in (working copy) -@@ -124,7 +124,7 @@ - DEFAULT_OSDIR="unix" - echo "(Default will be ${DEFAULT_OSDIR})" - --apr_modules="file_io network_io threadproc misc locks time mmap shmem user memory atomic poll support random" -+apr_modules="file_io network_io threadproc misc locks time mmap shmem user memory atomic poll support random xattr" - - dnl Checks for programs. - AC_PROG_MAKE_SET -@@ -1135,7 +1135,9 @@ - sys/types.h \ - sys/uio.h \ - sys/un.h \ -- sys/wait.h) -+ sys/wait.h \ -+ sys/xattr.h \ -+ sys/extattr.h) - - # IRIX 6.5 has a problem in which prevents it from - # being included by itself. Check for manually, -@@ -1187,6 +1189,8 @@ - AC_SUBST(unistdh) - AC_SUBST(signalh) - AC_SUBST(sys_waith) -+AC_SUBST(sys_xattrh) -+AC_SUBST(sys_extattrh) - AC_SUBST(pthreadh) - AC_SUBST(semaphoreh) - AC_SUBST(windowsh) -@@ -2030,6 +2034,87 @@ - APR_CHECK_DIRENT_INODE - APR_CHECK_DIRENT_TYPE - -+dnl ----------------------------- Checking for Extended Attributes Support -+echo "${nl}Checking for Extended Attributes Support..." -+ -+# Check whether Extended Attributes have explicitly been disabled -+AC_ARG_ENABLE(xattr, -+ [ --disable-xattr Disable Extended Attributes support in APR.], -+ [ if test "$enableval" = "no"; then -+ user_disabled_xattr=1 -+ fi ], -+ [ user_disabled_xattr=0 ] ) -+ -+xattrdarwin="0" -+xattrlinux="0" -+xattrfreebsd="0" -+xattrsolaris="0" -+if test "$user_disabled_xattr" = 1; then -+ echo "no -- disabled by user" -+else -+ AC_CHECK_FUNCS([fgetxattr fsetxattr flistxattr fremovexattr lgetxattr \ -+ extattr_get_fd extattr_set_fd extattr_list_fd \ -+ extattr_delete_fd openat unlinkat]) -+ APR_CHECK_DEFINE(O_XATTR, sys/fcntl.h) -+ APR_CHECK_DEFINE(XATTR_NOFOLLOW, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_CREATE, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_REPLACE, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_NAME_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_SIZE_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_LIST_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_MAXNAMELEN, sys/xattr.h) -+ APR_CHECK_DEFINE(EXTATTR_NAMESPACE_USER, sys/extattr.h) -+ APR_CHECK_DEFINE(EXTATTR_NAMESPACE_SYSTEM, sys/extattr.h) -+ APR_CHECK_DEFINE(EXTATTR_MAXNAMELEN, sys/extattr.h) -+ -+ APR_BEGIN_DECISION([xattr attribute system interface]) -+ APR_IFALLYES(header:sys/xattr.h dnl -+ define:XATTR_NOFOLLOW dnl -+ func:fgetxattr dnl -+ func:fsetxattr dnl -+ func:flistxattr dnl -+ func:fremovexattr, -+ [xattrdarwin="1" -+ APR_DECIDE(USE_XATTR_DARWIN, [xattr (Darwin)])]) -+ -+ APR_IFALLYES(header:sys/xattr.h dnl -+ func:lgetxattr dnl -+ func:fgetxattr dnl -+ func:fsetxattr dnl -+ func:flistxattr dnl -+ func:fremovexattr, -+ [xattrlinux="1" -+ APR_DECIDE(USE_XATTR_LINUX, [xattr (Linux)])]) -+ -+ APR_IFALLYES(header:sys/extattr.h dnl -+ func:extattr_set_fd dnl -+ func:func:extattr_get_fd dnl -+ func:extattr_list_fd dnl -+ func:func:extattr_delete_fd, -+ [xattrfreebsd="1" -+ APR_DECIDE(USE_XATTR_FREEBSD, [extattr (FreeBSD)])]) -+ -+ APR_IFALLYES(define:O_XATTR dnl -+ func:openat dnl -+ func:unlinkat, -+ [xattrsolaris="1" -+ APR_DECIDE(USE_XATTR_SOLARIS, [attropen (Solaris)])]) -+ -+ if test "x$ac_decision" = "x"; then -+ ac_decision="USE_XATTR_NONE" -+ ac_decision_msg="no xattr interface available" -+ fi -+ APR_END_DECISION -+ AC_DEFINE_UNQUOTED($ac_decision) -+fi -+ -+if test "$xattrdarwin$xattrlinux$xattrfreebsd$xattrsolaris" = "0000"; then -+ xattr="0" -+else -+ xattr="1" -+fi -+AC_SUBST(xattr) -+ - dnl ----------------------------- Checking for UUID Support - echo "${nl}Checking for OS UUID Support..." - -Index: build.conf -=================================================================== ---- build.conf (revision 606453) -+++ build.conf (working copy) -@@ -13,7 +13,7 @@ - # directories that have platform-specific code in them. the resulting - # pattern will be: SUBDIR/PLATFORM/*.c - platform_dirs = -- dso file_io locks memory misc mmap network_io poll random -+ dso file_io locks memory misc mmap network_io poll random xattr - shmem support threadproc time user atomic - - # all the public headers diff --git a/dev-libs/apr/files/apr-xattr-headers.patch b/dev-libs/apr/files/apr-xattr-headers.patch deleted file mode 100644 index 329d7a8c..00000000 --- a/dev-libs/apr/files/apr-xattr-headers.patch +++ /dev/null @@ -1,366 +0,0 @@ -Index: include/apr_file_xattr.h -=================================================================== ---- include/apr_file_xattr.h (revision 0) -+++ include/apr_file_xattr.h (revision 0) -@@ -0,0 +1,249 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#ifndef APR_FILE_XATTR_H -+#define APR_FILE_XATTR_H -+ -+/** -+ * @file apr_file_xattr.h -+ * @brief APR File Extended Attributes -+ */ -+ -+#include "apr.h" -+#include "apr_pools.h" -+#include "apr_tables.h" -+#include "apr_file_io.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+/** -+ * @defgroup apr_xattr File Extended Attribute Functions -+ * @ingroup APR -+ * @{ -+ */ -+ -+/** When setting values, fail if the attribute already exists */ -+#define APR_XATTR_CREATE 1 -+ -+/** When setting values, fail if the attribute does not already exist */ -+#define APR_XATTR_REPLACE 2 -+ -+typedef struct apr_xattr_t apr_xattr_t; -+ -+/** -+ * Open a context for access to the extended attributes of a file or -+ * directory specified by a path name -+ * -+ * @param new the context allocated for access to extended attributes -+ * @param pathname the path name of the file or directory -+ * @param p the pool to allocate any memory from -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the path was opened for attribute access
-+ *        APR_STATUS_IS_ENOENT()  the file or directory does not exist
-+ *
-+ * Other operating system dependant error codes may be returned. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p); -+ -+/** -+ * Open a context for access to the extended attributes of an open file -+ * -+ * @param new the context allocated for access to extended attributes -+ * @param file the open file to access the extended attributes on -+ * @param p the pool to allocate any memory from -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the file was opened for attribute access
-+ *
-+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p); -+ -+/** -+ * Open a context for access to the extended attributes of an open directory -+ * -+ * @param new the context allocated for access to extended attributes -+ * @param dir the open directory to access the extended attributes on -+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the directory was opened for attribute access
-+ *
-+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p); -+ -+/** -+ * Destroy a context used for access to extended attributes -+ * -+ * @param xattr the context to destroy -+ * 
-+ *        APR_SUCCESS             the context was destroyed
-+ *
-+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr); -+ -+/** -+ * Set an extended attribute on a file or directory -+ * @param xattr the opened extended attribute file or directory context -+ * @param name the attribute name to set -+ * @param value the attribute value -+ * @param size the size in bytes of the attribute value -+ * @param flags to control how the attribute is set -+ * 
-+ *         APR_XATTR_CREATE       return an error if the attribute name
-+ *                                already exists.
-+ *         APR_XATTR_REPLACE      return an error if the attribute name
-+ *                                does not already exist.
-+ *
-+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the attribute was set
-+ *        APR_STATUS_IS_EEXIST()  create flag and the attribute exists
-+ *        APR_STATUS_IS_ENOATTR() replace flag and the attribute doesn't exist
-+ *
-+ * Other operating system dependant error codes may be returned -+ * in the cases not listed above. -+ * -+ * @remark if neither flag APR_XATTR_CREATE or APR_XATTR_REPLACE are -+ * given then the attribute will either be created if it does not -+ * already exist or replaced if it does exist. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags); -+ -+/** -+ * Get an extended attribute from a file or directory -+ * @param xattr the opened extended attribute file or directory context -+ * @param name the name of the attribute to get -+ * @param value the returned attribute value allocated from the pool -+ * @param size the returned size of the attribute value -+ * @param flags to control how the attribute is got (reserved for future use) -+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the attribute was retrieved
-+ *        APR_STATUS_IS_ENOATTR() the attribute does not exist
-+ *
-+ * Other operating system dependant error codes may be returned -+ * in the cases not listed above. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags); -+ -+/** -+ * Check for the existence of an extended attribute on a file or directory -+ * @param xattr the opened extended attribute file or directory context -+ * @param name the name of the attribute to get -+ * @param exists the returned value indicating whether the attribute exists -+ * @param flags to control how the attribute is got (reserved for future use) -+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the existence was successfully tested
-+ *
-+ * Other operating system dependant error codes may be returned -+ * in the cases not listed above. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags); -+ -+/** -+ * List the extended attributes on a file or directory -+ * @param xattr the opened extended attribute file or directory context -+ * @param list the returned array of attributes names -+ * @param flags to control how the file is listed (reserved for future use) -+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the attributes were listed
-+ *
-+ * Other operating system dependant error codes may be returned -+ * in the cases not listed above. -+ * -+ * @remark list is an array containing simple null terminated strings. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags); -+ -+/** -+ * Remove an extended attribute from a file or directory -+ * @param xattr the opened extended attribute file or directory context -+ * @param name the attribute name to remove -+ * @param flags to control how the attribute is removed (reserved for future use) -+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the attribute was removed
-+ *        APR_STATUS_IS_ENOATTR() the attribute does not exist
-+ *
-+ * Other operating system dependant error codes may be returned -+ * in the cases not listed above. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags); -+/** @} */ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* ! APR_FILE_XATTR_H */ -Index: include/arch/unix/apr_arch_xattr.h -=================================================================== ---- include/arch/unix/apr_arch_xattr.h (revision 0) -+++ include/arch/unix/apr_arch_xattr.h (revision 0) -@@ -0,0 +1,51 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#ifndef FILE_XATTR_H -+#define FILE_XATTR_H -+ -+#if APR_HAVE_CTYPE_H -+#include -+#endif -+#if APR_HAVA_ERRNO_H -+#include -+#endif -+#if APR_HAVE_SYS_XATTR_H -+#include -+#endif -+#if APR_HAVE_SYS_EXTATTR_H -+#include -+#endif -+#if APR_HAVE_FCNTL_H -+#include -+#endif -+#if APR_HAVE_DIRENT_H -+#include -+#endif -+ -+#ifdef _LARGEFILE64_SOURCE -+#define XATTR_OPEN_FLAGS O_RDONLY | O_LARGEFILE -+#else -+#define XATTR_OPEN_FLAGS O_RDONLY -+#endif -+ -+struct apr_xattr_t { -+ int fd; -+ apr_uint32_t flags; -+ apr_pool_t *pool; -+}; -+ -+#endif -Index: include/apr_errno.h -=================================================================== ---- include/apr_errno.h (revision 606453) -+++ include/apr_errno.h (working copy) -@@ -851,6 +851,13 @@ - #define APR_EAFNOSUPPORT (APR_OS_START_CANONERR + 27) - #endif - -+/** @see APR_STATUS_IS_ENOATTR */ -+#ifdef ENOATTR -+#define APR_ENOATTR ENOATTR -+#else -+#define APR_ENOATTR (APR_OS_START_CANONERR + 28) -+#endif -+ - /** @} */ - - #if defined(OS2) && !defined(DOXYGEN) -@@ -995,6 +1002,7 @@ - || (s) == APR_OS_START_SYSERR + ERROR_ACCESS_DENIED) - #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_AFNOSUPPORT \ - || (s) == APR_OS_START_SYSERR + SOCEAFNOSUPPORT) -+#define APR_STATUS_IS_ENOATTR(s) ((s) == APR_ENOATTR) - - /* - Sorry, too tired to wrap this up for OS2... feel free to -@@ -1139,6 +1147,7 @@ - || (s) == APR_OS_START_SYSERR + ERROR_DIR_NOT_EMPTY) - #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT \ - || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT) -+#define APR_STATUS_IS_ENOATTR(s) ((s) == APR_ENOATTR) - - #elif defined(NETWARE) && defined(USE_WINSOCK) && !defined(DOXYGEN) /* !defined(OS2) && !defined(WIN32) */ - -@@ -1200,6 +1209,7 @@ - #define APR_STATUS_IS_ENOTEMPTY(s) ((s) == APR_ENOTEMPTY) - #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT \ - || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT) -+#define APR_STATUS_IS_ENOATTR(s) ((s) == APR_ENOATTR) - - #else /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */ - -@@ -1319,6 +1329,13 @@ - (s) == APR_EEXIST) - /** Address Family not supported */ - #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT) -+/** Attribute does not exists */ -+#ifdef ENODATA -+#define APR_STATUS_IS_ENOATTR(s) ((s) == APR_ENOATTR \ -+ || (s) == ENODATA) -+#else -+#define APR_STATUS_IS_ENOATTR(s) ((s) == APR_ENOATTR) -+#endif - /** @} */ - - #endif /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */ diff --git a/dev-libs/apr/files/apr-xattr-impl.patch b/dev-libs/apr/files/apr-xattr-impl.patch deleted file mode 100644 index 47628c9a..00000000 --- a/dev-libs/apr/files/apr-xattr-impl.patch +++ /dev/null @@ -1,1233 +0,0 @@ -Index: xattr/unix/xattr.c -=================================================================== ---- xattr/unix/xattr.c (revision 0) -+++ xattr/unix/xattr.c (revision 0) -@@ -0,0 +1,165 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_private.h" -+#include "apr_tables.h" -+ -+#if USE_XATTR_DARWIN || USE_XATTR_FREEBSD || USE_XATTR_LINUX || \ -+ USE_XATTR_SOLARIS -+ -+#include "apr_arch_file_io.h" -+#include "apr_arch_xattr.h" -+ -+#include "apr_file_xattr.h" -+ -+ -+static apr_status_t xattr_cleanup(void *xattr) -+{ -+ close(((apr_xattr_t*)xattr)->fd); -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p) -+{ -+ int fd; -+ int osflags = 0; -+ -+ fd = open(pathname, XATTR_OPEN_FLAGS); -+ if (fd < 0) { -+ return errno; -+ } -+ -+ *new = apr_palloc(p, sizeof(apr_xattr_t)); -+ (*new)->fd = fd; -+ (*new)->flags = 0; -+ (*new)->pool = p; -+ -+ apr_pool_cleanup_register((*new)->pool, (void *)(*new), -+ xattr_cleanup, xattr_cleanup); -+ -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p) -+{ -+ *new = apr_palloc(p, sizeof(apr_xattr_t)); -+ (*new)->fd = file->filedes; -+ (*new)->flags = APR_FILE_NOCLEANUP; -+ (*new)->pool = p; -+ -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p) -+{ -+ *new = apr_palloc(p, sizeof(apr_xattr_t)); -+ (*new)->fd = dirfd(dir->dirstruct); -+ (*new)->flags = APR_FILE_NOCLEANUP; -+ (*new)->pool = p; -+ -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr) -+{ -+ if (!(xattr->flags & APR_FILE_NOCLEANUP)) { -+ return apr_pool_cleanup_run(xattr->pool, xattr, xattr_cleanup); -+ } -+ return APR_SUCCESS; -+} -+ -+#else -+ -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ *exists = 0; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+#endif -Index: xattr/unix/darwin.c -=================================================================== ---- xattr/unix/darwin.c (revision 0) -+++ xattr/unix/darwin.c (revision 0) -@@ -0,0 +1,143 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_private.h" -+ -+#if USE_XATTR_DARWIN -+ -+#include "apr_arch_xattr.h" -+ -+#include "apr_strings.h" -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ int ret; -+ int osflags = 0; -+ -+ if (flags & APR_XATTR_CREATE) { -+ osflags |= XATTR_CREATE; -+ } -+ if (flags & APR_XATTR_REPLACE) { -+ osflags |= XATTR_REPLACE; -+ } -+ -+ ret = fsetxattr(xattr->fd, name, value, size, 0, osflags); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t ret; -+ -+ ret = fgetxattr(xattr->fd, name, NULL, 0, 0, 0); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *value = apr_palloc(xattr->pool, ret); -+ -+ ret = fgetxattr(xattr->fd, name, *value, ret, 0, 0); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *size = ret; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t ret; -+ -+ ret = fgetxattr(xattr->fd, name, NULL, 0, 0, 0); -+ -+ if (ret < 0) { -+ *exists = 0; -+ if (errno == ENOATTR) { -+ return APR_SUCCESS; -+ } -+ return errno; -+ } -+ *exists = 1; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t lsize; -+ char *listbuf, *listp; -+ -+ lsize = flistxattr(xattr->fd, NULL, 0, 0); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ if (lsize == 0) { -+ *list = apr_array_make(xattr->pool, 0, sizeof(char*)); -+ return APR_SUCCESS; -+ } -+ listbuf = apr_palloc(xattr->pool, lsize); -+ -+ lsize = flistxattr(xattr->fd, listbuf, lsize, 0); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ *list = apr_array_make(xattr->pool, 1, sizeof(char*)); -+ listp = listbuf; -+ while (listp < listbuf + lsize) { -+ int attrlen = strlen(listp) + 1; -+ *(char**)apr_array_push(*list) = listp; -+ listp += attrlen; -+ } -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ int ret; -+ -+ ret = fremovexattr(xattr->fd, name, 0); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ return APR_SUCCESS; -+} -+ -+#endif /* USE_XATTR_DARWIN */ -Index: xattr/unix/linux.c -=================================================================== ---- xattr/unix/linux.c (revision 0) -+++ xattr/unix/linux.c (revision 0) -@@ -0,0 +1,156 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_private.h" -+ -+#if USE_XATTR_LINUX -+ -+#include "apr_arch_xattr.h" -+ -+#include "apr_strings.h" -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+static const char* user_ns_prefix = "user."; -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ int ret; -+ int osflags = 0; -+ -+ char *tmpname = apr_pstrcat(xattr->pool, user_ns_prefix, name, NULL); -+ -+ if (flags & APR_XATTR_CREATE) { -+ osflags |= XATTR_CREATE; -+ } -+ if (flags & APR_XATTR_REPLACE) { -+ osflags |= XATTR_REPLACE; -+ } -+ -+ ret = fsetxattr(xattr->fd, tmpname, value, size, osflags); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t ret; -+ char *tmpname = apr_pstrcat(xattr->pool, user_ns_prefix, name, NULL); -+ -+ ret = fgetxattr(xattr->fd, tmpname, NULL, 0); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *value = apr_palloc(xattr->pool, ret); -+ -+ ret = fgetxattr(xattr->fd, tmpname, *value, ret); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *size = ret; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t ret; -+ char *tmpname = apr_pstrcat(xattr->pool, user_ns_prefix, name, NULL); -+ -+ ret = fgetxattr(xattr->fd, tmpname, NULL, 0); -+ -+ if (ret < 0) { -+ *exists = 0; -+ if (errno == ENODATA) { -+ return APR_SUCCESS; -+ } -+ return errno; -+ } -+ *exists = 1; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t lsize; -+ char *listbuf, *listp; -+ -+ lsize = flistxattr(xattr->fd, NULL, 0); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ if (lsize == 0) { -+ *list = apr_array_make(xattr->pool, 0, sizeof(char*)); -+ return APR_SUCCESS; -+ } -+ listbuf = apr_palloc(xattr->pool, lsize); -+ -+ lsize = flistxattr(xattr->fd, listbuf, lsize); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ *list = apr_array_make(xattr->pool, 1, sizeof(char*)); -+ listp = listbuf; -+ while (listp < listbuf + lsize) { -+ int attrlen = strlen(listp) + 1; -+ int user_ns_prefix_len = strlen(user_ns_prefix); -+ if (strncmp(listp, user_ns_prefix, user_ns_prefix_len) != 0) { -+ continue; -+ } -+ listp += user_ns_prefix_len; -+ attrlen -= user_ns_prefix_len; -+ *(char**)apr_array_push(*list) = listp; -+ listp += attrlen; -+ } -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ int ret; -+ char *tmpname = apr_pstrcat(xattr->pool, user_ns_prefix, name, NULL); -+ -+ ret = fremovexattr(xattr->fd, tmpname); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ return APR_SUCCESS; -+} -+ -+#endif /* USE_XATTR_LINUX */ -Index: xattr/unix/freebsd.c -=================================================================== ---- xattr/unix/freebsd.c (revision 0) -+++ xattr/unix/freebsd.c (revision 0) -@@ -0,0 +1,162 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_private.h" -+ -+#if USE_XATTR_FREEBSD -+ -+#include "apr_arch_xattr.h" -+ -+#include "apr_strings.h" -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ int ret; -+ -+ if ((flags & APR_XATTR_CREATE) && (flags & APR_XATTR_REPLACE)) { -+ return APR_EINVAL; -+ } -+ -+ if ((flags & APR_XATTR_CREATE) || (flags & APR_XATTR_REPLACE)) { -+ -+ ret = extattr_get_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name, NULL, 0); -+ -+ if (ret >= 0 && (flags & APR_XATTR_CREATE)) { -+ return APR_EEXIST; -+ } -+ else if (ret == -1 && errno == ENOATTR) { -+ if (flags & APR_XATTR_REPLACE) { -+ return APR_ENOATTR; -+ } -+ } -+ else if (ret == -1) { -+ return errno; -+ } -+ } -+ -+ ret = extattr_set_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name, value, size); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ int ret; -+ -+ ret = extattr_get_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name, NULL, 0); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *value = apr_palloc(xattr->pool, ret); -+ -+ ret = extattr_get_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name, *value, ret); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *size = ret; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ int ret; -+ -+ ret = extattr_get_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name, NULL, 0); -+ -+ if (ret < 0) { -+ *exists = 0; -+ if (errno == ENOATTR) { -+ return APR_SUCCESS; -+ } -+ return errno; -+ } -+ *exists = 1; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ int lsize; -+ char *listbuf, *listp; -+ -+ lsize = extattr_list_fd(xattr->fd, EXTATTR_NAMESPACE_USER, NULL, 0); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ if (lsize == 0) { -+ *list = apr_array_make(xattr->pool, 0, sizeof(char*)); -+ return APR_SUCCESS; -+ } -+ listbuf = apr_palloc(xattr->pool, lsize); -+ -+ lsize = extattr_list_fd(xattr->fd, EXTATTR_NAMESPACE_USER, listbuf, lsize); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ -+ *list = apr_array_make(xattr->pool, 1, sizeof(char*)); -+ listp = listbuf; -+ while(listp < listbuf + lsize) { -+ /* first byte is the length of the attribute name and the -+ strings are not null terminated, so we copy them */ -+ int attrlen = (int)*listp; -+ *(char**)apr_array_push(*list) = apr_pstrndup(xattr->pool, listp+1, -+ attrlen); -+ listp += (attrlen + 1); -+ } -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ int ret; -+ -+ ret = extattr_delete_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ -+ return APR_SUCCESS; -+} -+ -+#endif /* USE_XATTR_FREEBSD */ -Index: xattr/unix/solaris.c -=================================================================== ---- xattr/unix/solaris.c (revision 0) -+++ xattr/unix/solaris.c (revision 0) -@@ -0,0 +1,300 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_private.h" -+ -+#if USE_XATTR_SOLARIS -+ -+#include "apr_arch_xattr.h" -+#include "apr_arch_file_io.h" -+ -+#include "apr_strings.h" -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+/* The following code is for escaping and unescaping '/' chars -+ (and '%' as it is used as an escape character) in attribute names. -+ -+ This is because '/' can't be used in Solaris subfile names and doing -+ so could present a security risk as files could be opened elsewhere. -+*/ -+ -+static char nibble_to_hex(register char c) -+{ -+ if (c >= 0 && c <= 9) return '0' + c; -+ if (c >= 10 && c <= 15) return 'a' + c - 10; -+ else return 0; -+} -+ -+static char hex_to_nibble(register char c) -+{ -+ if (c >= '0' && c <= '9') return c - '0'; -+ if (c >= 'a' && c <= 'f') return c - 'a' + 10; -+ else if(c >= 'A' && c <= 'F') return c - 'A' + 10; -+ else return 0; -+} -+ -+static const char* escape_attr_name(const char *name, apr_pool_t *p) -+{ -+ const char *namep; -+ int hasspecial = 0; -+ apr_array_header_t *arr; -+ -+ /* fastpath if atttrname contains no characters that need escaping */ -+ if(strchr(name, '/') == NULL && strchr(name, '%') == NULL) { -+ return name; -+ } -+ -+ /* start with a conservative amount of additional space */ -+ arr = apr_array_make(p, strlen(name) + 16, sizeof(char)); -+ namep = name; -+ while (*namep) { -+ if(*namep == '/' || *namep == '%') { -+ *(char*)apr_array_push(arr) = '%'; -+ *(char*)apr_array_push(arr) = nibble_to_hex(*namep >> 4); -+ *(char*)apr_array_push(arr) = nibble_to_hex(*namep & 0x0f); -+ } else { -+ *(char*)apr_array_push(arr) = *namep; -+ } -+ namep++; -+ } -+ *(char*)apr_array_push(arr) = '\0'; -+ -+ return arr->elts; -+} -+ -+static const char* unescape_attr_name(const char *name, apr_pool_t *p) -+{ -+ const char *namep; -+ int hasspecial = 0; -+ apr_array_header_t *arr; -+ -+ /* fastpath if atttrname contains no escaped characters */ -+ if(strchr(name, '%') == NULL) { -+ return name; -+ } -+ -+ /* start with a conservative amount of additional space */ -+ arr = apr_array_make(p, strlen(name) + 16, sizeof(char)); -+ namep = name; -+ while (*namep) { -+ if(*namep == '%' && *(namep+1) != 0 && *(namep+2) != 0) { -+ namep++; -+ *(char*)apr_array_push(arr) = -+ hex_to_nibble(*namep++) << 4 | hex_to_nibble(*namep++); -+ } else { -+ *(char*)apr_array_push(arr) = *namep++; -+ } -+ } -+ *(char*)apr_array_push(arr) = '\0'; -+ -+ return arr->elts; -+} -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ int ret, fd, osflags; -+ struct_stat statbuf; -+ -+ if (strncmp(name, "SUNW", 4) == 0) { -+ /* don't clash with sun namespace */ -+ return EINVAL; -+ } else if (flags & APR_XATTR_CREATE && flags & APR_XATTR_REPLACE) { -+ return EINVAL; -+ } else if (flags & APR_XATTR_CREATE) { -+ osflags = O_CREAT | O_EXCL; -+ } else if (flags & APR_XATTR_REPLACE) { -+ osflags = 0; -+ } else { -+ osflags = O_CREAT; -+ } -+ -+ fd = openat(xattr->fd, escape_attr_name(name, xattr->pool), -+ osflags | O_XATTR | O_TRUNC | O_WRONLY, 0666); -+ -+ if (fd < 0) { -+ if(errno == ENOENT) { -+ return APR_ENOATTR; -+ } -+ return errno; -+ } -+ -+ do { -+ ret = write(fd, value, size); -+ } while(ret < 0 && errno == EINTR); -+ -+ if (ret < 0) { -+ ret = errno; -+ } -+ else if (ret != size) { -+ ret = APR_EGENERAL; -+ } -+ else { -+ ret = APR_SUCCESS; -+ } -+ close(fd); -+ return ret; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ int ret, fd; -+ ssize_t rsize; -+ struct_stat statbuf; -+ -+ fd = openat(xattr->fd, escape_attr_name(name, xattr->pool), -+ O_RDONLY | O_XATTR); -+ if (fd < 0) { -+ if(errno == ENOENT) { -+ return APR_ENOATTR; -+ } -+ return errno; -+ } -+ -+ ret = fstat(fd, &statbuf); -+ -+ if (ret < 0) { -+ ret = errno; -+ close(fd); -+ return ret; -+ } -+ *value = apr_palloc(xattr->pool, statbuf.st_size); -+ -+ do { -+ rsize = read(fd, *value, statbuf.st_size); -+ } while(rsize < 0 && errno == EINTR); -+ -+ if (rsize < 0) { -+ ret = errno; -+ } -+ else if (rsize != statbuf.st_size) { -+ ret = APR_EGENERAL; -+ } -+ else { -+ ret = APR_SUCCESS; -+ *size = rsize; -+ } -+ close(fd); -+ return ret; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ int ret, fd; -+ ssize_t rsize; -+ struct_stat statbuf; -+ -+ fd = openat(xattr->fd, escape_attr_name(name, xattr->pool), -+ O_RDONLY | O_XATTR); -+ if (fd < 0) { -+ *exists = 0; -+ if(errno == ENOENT) { -+ /* non-existant attribute does not return an error */ -+ return APR_SUCCESS; -+ } -+ return errno; -+ } -+ *exists = 1; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ int ret, fd; -+ DIR *dirp; -+ struct dirent *ent, *retent; -+ apr_size_t dirent_size = -+ sizeof(*ent) + (sizeof(ent->d_name) > 1 ? 0 : 255); -+ -+ fd = openat(xattr->fd, ".", O_RDONLY | O_XATTR); -+ -+ if (fd < 0) { -+ return errno; -+ } -+ dirp = fdopendir(fd); -+ if (dirp == NULL) { -+ ret = errno; -+ close(fd); -+ return ret; -+ } -+ -+ *list = apr_array_make(xattr->pool, 1, sizeof(char*)); -+ ent = apr_palloc(xattr->pool, dirent_size); -+ while ((ret = readdir_r(dirp, ent, &retent)) == 0 && retent) { -+ const char *name; -+ if (strncmp(ent->d_name, "SUNW", 4) == 0 || /* private */ -+ strcmp(ent->d_name, ".") == 0 || -+ strcmp(ent->d_name, "..") == 0) continue; -+ -+ name = unescape_attr_name(ent->d_name, xattr->pool); -+ /* we don't need to copy if the name has been unescaped as it -+ is pool allocated memory already */ -+ *(const char**)apr_array_push(*list) = -+ (name != ent->d_name) ? -+ name : apr_pstrdup(xattr->pool, ent->d_name); -+ } -+ -+ if (ret < 0) { -+ ret = errno; -+ } -+ else { -+ ret = APR_SUCCESS; -+ } -+ closedir(dirp); -+ return ret; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ int ret, fd; -+ struct_stat statbuf; -+ -+ fd = openat(xattr->fd, ".", O_XATTR | O_RDONLY); -+ -+ if (fd < 0) { -+ return errno; -+ } -+ -+ ret = unlinkat(fd, escape_attr_name(name, xattr->pool), 0); -+ -+ if (ret < 0) { -+ ret = (errno == ENOENT) ? APR_ENOATTR : errno; -+ } -+ else { -+ ret = APR_SUCCESS; -+ } -+ close(fd); -+ return ret; -+} -+ -+#endif /* USE_XATTR_SOLARIS */ -Index: xattr/netware/xattr.c -=================================================================== ---- xattr/netware/xattr.c (revision 0) -+++ xattr/netware/xattr.c (revision 0) -@@ -0,0 +1,89 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ *exists = 0; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -Index: xattr/os2/xattr.c -=================================================================== ---- xattr/os2/xattr.c (revision 0) -+++ xattr/os2/xattr.c (revision 0) -@@ -0,0 +1,89 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ *exists = 0; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -Index: xattr/win32/xattr.c -=================================================================== ---- xattr/win32/xattr.c (revision 0) -+++ xattr/win32/xattr.c (revision 0) -@@ -0,0 +1,89 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ *exists = 0; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} diff --git a/dev-libs/apr/files/apr-xattr-tests.patch b/dev-libs/apr/files/apr-xattr-tests.patch deleted file mode 100644 index 6e979c63..00000000 --- a/dev-libs/apr/files/apr-xattr-tests.patch +++ /dev/null @@ -1,542 +0,0 @@ -Index: test/Makefile.in -=================================================================== ---- test/Makefile.in (revision 606453) -+++ test/Makefile.in (working copy) -@@ -28,7 +28,7 @@ - testhash.lo testargs.lo testnames.lo testuser.lo testpath.lo \ - testenv.lo testprocmutex.lo testfnmatch.lo testatomic.lo testflock.lo \ - testsock.lo testglobalmutex.lo teststrnatcmp.lo testfilecopy.lo \ -- testtemp.lo testlfs.lo testcond.lo -+ testtemp.lo testlfs.lo testcond.lo testxattr.lo - - OTHER_PROGRAMS = \ - sendfile@EXEEXT@ \ -Index: test/testxattr.c -=================================================================== ---- test/testxattr.c (revision 0) -+++ test/testxattr.c (revision 0) -@@ -0,0 +1,499 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_file_io.h" -+#include "apr_file_xattr.h" -+#include "apr_errno.h" -+#include "apr_general.h" -+#include "testutil.h" -+ -+#if APR_HAS_XATTR -+ -+#define DIRNAME "data" -+#define FNAME DIRNAME "/file_xattrfile.txt" -+#define DNAME DIRNAME "/dir_xattrdir" -+ -+#define TESTKEY1 "testkey1" -+#define TESTVAL1 "testval1" -+#define TESTKEY2 "testkey2" -+#define TESTVAL2 "testval2" -+ -+/* test solaris subfilename escaping */ -+#define TESTKEYSPECIAL1 "/testkey2" -+#define TESTKEYSPECIAL2 "%testkey2" -+ -+static void test_xattr_file_set(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_set_create(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), -+ APR_XATTR_CREATE); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), -+ APR_XATTR_CREATE); -+ ABTS_TRUE(tc, APR_STATUS_IS_EEXIST(rv)); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_set_replace(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), -+ APR_XATTR_REPLACE); -+ ABTS_TRUE(tc, APR_STATUS_IS_ENOATTR(rv)); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), -+ APR_XATTR_CREATE); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), -+ APR_XATTR_REPLACE); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_get(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, TESTKEY1, (void**)&val, &size, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_INT_EQUAL(tc, strlen(TESTVAL1), size); -+ ABTS_PTR_NOTNULL(tc, val); -+ ABTS_TRUE(tc, strncmp(TESTVAL1, val, strlen(TESTVAL1)) == 0); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_get_enoattr(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, TESTKEY1, (void**)&val, &size, 0); -+ ABTS_TRUE(tc, APR_STATUS_IS_ENOATTR(rv)); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_exists(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ int exists; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_exists(xattr, TESTKEY1, &exists, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_TRUE(tc, !exists); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_exists(xattr, TESTKEY1, &exists, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_TRUE(tc, exists); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_list(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_array_header_t *list = NULL; -+ int cmp1, cmp2; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ rv = apr_xattr_set(xattr, TESTKEY2, TESTVAL2, strlen(TESTVAL2), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_list(xattr, &list, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_PTR_NOTNULL(tc, list); -+ ABTS_INT_EQUAL(tc, 2, list->nelts); -+ cmp1 = (strcmp(APR_ARRAY_IDX(list, 0, char*), TESTKEY1) == 0) && -+ (strcmp(APR_ARRAY_IDX(list, 1, char*), TESTKEY2) == 0); -+ cmp2 = (strcmp(APR_ARRAY_IDX(list, 0, char*), TESTKEY2) == 0) && -+ (strcmp(APR_ARRAY_IDX(list, 1, char*), TESTKEY1) == 0); -+ ABTS_TRUE(tc, cmp1 || cmp2 ); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_remove(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_remove(xattr, TESTKEY1, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, TESTKEY1, (void**)&val, &size, 0); -+ ABTS_INT_NEQUAL(tc, APR_SUCCESS, rv); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_remove_enoattr(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_remove(xattr, TESTKEY1, 0); -+ ABTS_TRUE(tc, APR_STATUS_IS_ENOATTR(rv)); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_dir_set(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ -+ rv = apr_dir_make(DNAME, APR_OS_DEFAULT, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, DNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ apr_xattr_destroy(xattr); -+ apr_dir_remove(DNAME, p); -+} -+ -+static void test_xattr_dir_get(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_dir_make(DNAME, APR_OS_DEFAULT, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, DNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, TESTKEY1, (void**)&val, &size, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_INT_EQUAL(tc, strlen(TESTVAL1), size); -+ ABTS_PTR_NOTNULL(tc, val); -+ ABTS_TRUE(tc, strncmp(TESTVAL1, val, strlen(TESTVAL1)) == 0); -+ -+ apr_xattr_destroy(xattr); -+ apr_dir_remove(DNAME, p); -+} -+ -+static void test_xattr_dir_exists(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ int exists; -+ -+ rv = apr_dir_make(DNAME, APR_OS_DEFAULT, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, DNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_exists(xattr, TESTKEY1, &exists, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_TRUE(tc, !exists); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_exists(xattr, TESTKEY1, &exists, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_TRUE(tc, exists); -+ -+ apr_xattr_destroy(xattr); -+ apr_dir_remove(DNAME, p); -+} -+ -+static void test_xattr_dir_list(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_array_header_t *list = NULL; -+ int cmp1, cmp2; -+ -+ rv = apr_dir_make(DNAME, APR_OS_DEFAULT, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, DNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ rv = apr_xattr_set(xattr, TESTKEY2, TESTVAL2, strlen(TESTVAL2), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_list(xattr, &list, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_PTR_NOTNULL(tc, list); -+ ABTS_INT_EQUAL(tc, 2, list->nelts); -+ cmp1 = (strcmp(APR_ARRAY_IDX(list, 0, char*), TESTKEY1) == 0) && -+ (strcmp(APR_ARRAY_IDX(list, 1, char*), TESTKEY2) == 0); -+ cmp2 = (strcmp(APR_ARRAY_IDX(list, 0, char*), TESTKEY2) == 0) && -+ (strcmp(APR_ARRAY_IDX(list, 1, char*), TESTKEY1) == 0); -+ ABTS_TRUE(tc, cmp1 || cmp2 ); -+ -+ apr_xattr_destroy(xattr); -+ apr_dir_remove(DNAME, p); -+} -+ -+static void test_xattr_dir_remove(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_dir_make(DNAME, APR_OS_DEFAULT, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, DNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_remove(xattr, TESTKEY1, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, TESTKEY1, (void**)&val, &size, 0); -+ ABTS_INT_NEQUAL(tc, APR_SUCCESS, rv); -+ -+ apr_xattr_destroy(xattr); -+ apr_dir_remove(DNAME, p); -+} -+ -+static void test_xattr_open_path_enoent(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_TRUE(tc, APR_STATUS_IS_ENOENT(rv)); -+} -+ -+static void test_xattr_file_special_chars(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ const char *name = (const char*)data; -+ char *val = NULL; -+ apr_array_header_t *list = NULL; -+ int cmp1, cmp2; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, name, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, name, (void**)&val, &size, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_INT_EQUAL(tc, strlen(TESTVAL1), size); -+ ABTS_PTR_NOTNULL(tc, val); -+ ABTS_TRUE(tc, strncmp(TESTVAL1, val, strlen(TESTVAL1)) == 0); -+ -+ rv = apr_xattr_list(xattr, &list, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_PTR_NOTNULL(tc, list); -+ ABTS_INT_EQUAL(tc, 1, list->nelts); -+ ABTS_TRUE(tc, strcmp(name, APR_ARRAY_IDX(list, 0, char*)) == 0); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+#else -+ -+static void test_xattr_not_impl(abts_case *tc, void *data) -+{ -+ ABTS_NOT_IMPL(tc, "xattr not implemented on this platform"); -+} -+ -+#endif /* APR_HAS_XATTR */ -+ -+abts_suite *testxattr(abts_suite *suite) -+{ -+ suite = ADD_SUITE(suite) -+ -+#if !APR_HAS_XATTR -+ abts_run_test(suite, test_xattr_not_impl, NULL); -+#else -+ abts_run_test(suite, test_xattr_file_set, NULL); -+ abts_run_test(suite, test_xattr_file_set_create, NULL); -+ abts_run_test(suite, test_xattr_file_set_replace, NULL); -+ abts_run_test(suite, test_xattr_file_get, NULL); -+ abts_run_test(suite, test_xattr_file_get_enoattr, NULL); -+ abts_run_test(suite, test_xattr_file_exists, NULL); -+ abts_run_test(suite, test_xattr_file_list, NULL); -+ abts_run_test(suite, test_xattr_file_remove, NULL); -+ abts_run_test(suite, test_xattr_file_remove_enoattr, NULL); -+ abts_run_test(suite, test_xattr_dir_set, NULL); -+ abts_run_test(suite, test_xattr_dir_get, NULL); -+ abts_run_test(suite, test_xattr_dir_exists, NULL); -+ abts_run_test(suite, test_xattr_dir_list, NULL); -+ abts_run_test(suite, test_xattr_dir_remove, NULL); -+ abts_run_test(suite, test_xattr_open_path_enoent, NULL); -+ abts_run_test(suite, test_xattr_file_special_chars, TESTKEYSPECIAL1); -+ abts_run_test(suite, test_xattr_file_special_chars, TESTKEYSPECIAL2); -+#endif -+ -+ return suite; -+} -Index: test/abts_tests.h -=================================================================== ---- test/abts_tests.h (revision 606453) -+++ test/abts_tests.h (working copy) -@@ -66,7 +66,8 @@ - {testtime}, - {testud}, - {testuser}, -- {testvsn} -+ {testvsn}, -+ {testxattr} - }; - - #endif /* APR_TEST_INCLUDES */ -Index: test/testutil.h -=================================================================== ---- test/testutil.h (revision 606453) -+++ test/testutil.h (working copy) -@@ -102,5 +102,6 @@ - abts_suite *testud(abts_suite *suite); - abts_suite *testuser(abts_suite *suite); - abts_suite *testvsn(abts_suite *suite); -+abts_suite *testxattr(abts_suite *suite); - - #endif /* APR_TEST_INCLUDES */ diff --git a/dev-libs/apr/files/apxattr.c b/dev-libs/apr/files/apxattr.c deleted file mode 100644 index 5a1082b9..00000000 --- a/dev-libs/apr/files/apxattr.c +++ /dev/null @@ -1,191 +0,0 @@ -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "apr.h" -#include "apr_lib.h" -#include "apr_getopt.h" -#include "apr_strings.h" -#include "apr_file_io.h" -#include "apr_file_xattr.h" - -#if APR_HAVE_STDLIB_H -#include -#endif - -#if !APR_HAS_XATTR -#error The APR you are using does not have extended attribute support -#endif - -static apr_file_t *errfile; -static const char *shortname = "apxattr"; - -static void usage(void) -{ - apr_file_printf(errfile, - "%s -- Utility to view/modify extended attributes on files." APR_EOL_STR - APR_EOL_STR - "Usage: %s -l FILENAME" APR_EOL_STR - " %s -g attr FILENAME" APR_EOL_STR - " %s -s attr -v value FILENAME" APR_EOL_STR - " %s -r attr FILENAME" APR_EOL_STR - APR_EOL_STR - "Options:" APR_EOL_STR - " -l List attributes" APR_EOL_STR - " -g Get attribute" APR_EOL_STR - " -s Set attribute" APR_EOL_STR - " -r Remove attributes" APR_EOL_STR, - shortname, shortname, shortname, shortname, shortname); - exit(1); -} - -int main(int argc, const char * const argv[]) -{ - apr_file_t * outfile; - apr_file_t * infile; - apr_file_t * thefile; - apr_pool_t * pool; - apr_getopt_t * o; - apr_status_t rv; - const char * arg; - char opt; - int opt_list = 0; - char errmsg[120]; - const char * opt_get = NULL, * opt_set = NULL, * opt_value = NULL, - * opt_remove = NULL, * filename = NULL; - - if (apr_app_initialize(&argc, &argv, NULL) != APR_SUCCESS) { - return 1; - } - atexit(apr_terminate); - - if (argc) { - shortname = apr_filepath_name_get(argv[0]); - } - - if (apr_pool_create(&pool, NULL) != APR_SUCCESS) { - return 1; - } - apr_file_open_stderr(&errfile, pool); - apr_getopt_init(&o, pool, argc, argv); - - while (1) { - rv = apr_getopt(o, "lg:s:r:v:", &opt, &arg); - if (rv == APR_EOF) { - break; - } - else if (rv != APR_SUCCESS) { - usage(); - } - else { - switch (opt) { - case 'l': - opt_list = 1; - break; - case 's': - if (opt_set || opt_get || opt_list || opt_remove) { - usage(); - } - opt_set = apr_pstrdup(pool, arg); - break; - case 'v': - if (opt_value || opt_get || opt_list || opt_remove) { - usage(); - } - opt_value = apr_pstrdup(pool, arg); - break; - case 'g': - if (opt_set || opt_get || opt_list || opt_remove) { - usage(); - } - opt_get = apr_pstrdup(pool, arg); - break; - case 'r': - if (opt_set || opt_get || opt_list || opt_remove) { - usage(); - } - opt_remove = apr_pstrdup(pool, arg); - break; - } - } - } - if ((opt_set && !opt_value) || o->ind != argc - 1) { - usage(); - } - filename = argv[o->ind]; - - apr_file_open_stdout(&outfile, pool); - apr_file_open_stdin(&infile, pool); - - rv = apr_file_open(&thefile, filename, APR_READ, 0, pool); - if(rv != APR_SUCCESS) { - apr_file_printf(errfile, "*** Couldn't open %s: %s\n", - filename, apr_strerror(rv, errmsg, sizeof errmsg)); - exit(1); - } - - if (opt_get) { - void *value; - char *value_str; - apr_size_t size; - rv = apr_file_xattr_get(thefile, opt_get, &value, &size, 0, pool); - if(rv != APR_SUCCESS) { - apr_file_printf(errfile, "*** Couldn't get attribute: %s\n", - apr_strerror(rv, errmsg, sizeof errmsg)); - exit(1); - } - else { - value_str = apr_pstrmemdup(pool, value, size); - apr_file_printf(outfile, "%s\n", value_str); - } - } - else if (opt_set) { - apr_size_t size; - rv = apr_file_xattr_set(thefile, opt_set, opt_value, - strlen(opt_value), 0, pool); - if(rv != APR_SUCCESS) { - apr_file_printf(errfile, "*** Couldn't set attribute: %s\n", - apr_strerror(rv, errmsg, sizeof errmsg)); - exit(1); - } - } - else if (opt_list) { - apr_array_header_t *list = NULL; - rv = apr_file_xattr_list(thefile, &list, 0, pool); - if(rv != APR_SUCCESS) { - apr_file_printf(errfile, "*** Couldn't list attributes: %s\n", - apr_strerror(rv, errmsg, sizeof errmsg)); - exit(1); - } - else { - int i; - for(i = 0; i < list->nelts; i++) { - apr_file_printf(outfile, "%s\n", APR_ARRAY_IDX(list, i, char*)); - } - } - } - else if (opt_remove) { - rv = apr_file_xattr_remove(thefile, opt_remove, 0, pool); - if(rv != APR_SUCCESS) { - apr_file_printf(errfile, "*** Couldn't remove attribute: %s\n", - apr_strerror(rv, errmsg, sizeof errmsg)); - exit(1); - } - } - - apr_file_close(thefile); - - return 0; -} diff --git a/dev-libs/apr/files/config.layout.patch b/dev-libs/apr/files/config.layout.patch deleted file mode 100644 index 66fa868c..00000000 --- a/dev-libs/apr/files/config.layout.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- config.layout.orig 2006-07-06 21:44:41.000000000 -0700 -+++ config.layout 2006-07-06 21:46:26.000000000 -0700 -@@ -229,3 +229,22 @@ - infodir: ${exec_prefix}/share/info - libsuffix: -${APR_MAJOR_VERSION} - -+ -+# Gentoo layout -+ -+ prefix: /usr -+ exec_prefix: ${prefix} -+ bindir: ${exec_prefix}/bin -+ sbindir: ${exec_prefix}/bin -+ libdir: ${exec_prefix}/lib -+ libexecdir: ${exec_prefix}/modules -+ mandir: ${prefix}/man -+ sysconfdir: ${prefix}/conf -+ datadir: /usr/share/apr-${APR_MAJOR_VERSION} -+ installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION} -+ includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION} -+ localstatedir: ${prefix} -+ libsuffix: -${APR_MAJOR_VERSION} -+ -+ -+ diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml deleted file mode 100644 index acee4d42..00000000 --- a/dev-libs/apr/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - maintainer-needed@gentoo.org - - - Enable binary compatibility with older kernels - Use /dev/urandom instead of /dev/random - Enable UUID support - - diff --git a/media-libs/liblastfm/ChangeLog b/media-libs/liblastfm/ChangeLog deleted file mode 100644 index bcb63234..00000000 --- a/media-libs/liblastfm/ChangeLog +++ /dev/null @@ -1,82 +0,0 @@ -# ChangeLog for media-libs/liblastfm -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.18 2012/10/22 19:17:39 johu Exp $ - -*liblastfm-1.0.3 (22 Oct 2012) - - 22 Oct 2012; Johannes Huber +liblastfm-1.0.3.ebuild: - Version bump. - -*liblastfm-1.0.2 (01 Sep 2012) - - 01 Sep 2012; Tomáš Chvátal +liblastfm-1.0.2.ebuild, - -liblastfm-1.0.1.ebuild: - Version bump to latest, remove older. - -*liblastfm-1.0.1 (23 Jun 2012) - - 23 Jun 2012; Johannes Huber +liblastfm-1.0.1.ebuild, - -liblastfm-0.3.0.ebuild, metadata.xml: - Version bump, remove old. - - 01 Jun 2011; Brent Baude liblastfm-0.3.3.ebuild: - Marking liblastfm-0.3.3 ppc stable for bug 354033 - - 09 May 2011; Markos Chandras liblastfm-0.3.3.ebuild: - Stable on amd64 wrt bug #354033 - - 09 May 2011; Thomas Kahle liblastfm-0.3.3.ebuild: - x86 stable per bug 354033 - - 14 Dec 2010; Andreas K. Huettel - liblastfm-0.3.3.ebuild, +files/liblastfm-0.3.3-ruby-1.9-fix.patch: - Applied patch sent to the amarok-packagers group by Thomas Klausner - - -*liblastfm-0.3.3 (27 Sep 2010) - - 27 Sep 2010; Jorge Manuel B. S. Vicetto - +liblastfm-0.3.3.ebuild: - [media-libs/liblastfm-0.3.3] Bumped version. - - 07 Jul 2010; Samuli Suominen - liblastfm-0.3.0.ebuild: - Keyword ~ppc64 wrt #280552 by Andreas Thalhammer. - - 05 Apr 2010; Maciej Mrozowski - liblastfm-0.3.0.ebuild: - Fixed, bug 287906 - support for ruby-1.9 - - 05 Apr 2010; Maciej Mrozowski - liblastfm-0.3.0.ebuild: - Fixed bug 292038, missing dependencies - - 25 Feb 2010; Alex Alexander liblastfm-0.3.0.ebuild: - added missing qt-test dep - - 23 Feb 2010; Joseph Jezak liblastfm-0.3.0.ebuild: - Marked ~ppc. - - 09 Nov 2009; Christian Faulhammer - liblastfm-0.3.0.ebuild: - stable x86, bug 290483 - - 09 Nov 2009; Samuli Suominen - liblastfm-0.3.0.ebuild: - Restrict Ruby depend to =dev-lang/ruby-1.8* wrt #287906, thanks to Ken - Rushia for reporting. - - 26 Oct 2009; Samuli Suominen - liblastfm-0.3.0.ebuild: - Block media-libs/lastfmlib wrt #290585 - - 26 Oct 2009; Samuli Suominen - liblastfm-0.3.0.ebuild: - amd64 stable wrt #290483 - -*liblastfm-0.3.0 (02 Oct 2009) - - 02 Oct 2009; Jorge Manuel B. S. Vicetto - +liblastfm-0.3.0.ebuild, +metadata.xml: - Added liblastfm to the tree from the kde-testing overlay. Thanks to Maciej - Mrozowski (reavertm). diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest deleted file mode 100644 index 94e9290e..00000000 --- a/media-libs/liblastfm/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST Last.fm-2.1.30.tar.bz2 5970748 SHA256 a8591930af2c76100840fa94082e831d5aeb2893c264528a15ec5151bf0cc2a4 SHA512 8a0ad9eda290a0a7d5d93f7a8fef505061c28101d1c6fc970d495a0cdca1fd9c90bdea6c4fe807161aee8ec940fdd9b94603834af3bf4d172d3b89fde1335cb6 WHIRLPOOL 75dad774538074c7e3ad4e7a41eec08f4a7425ace90daca8abda3b1b256f86655ec89e8624c85fbfbb93e0afffe4f63a4f5752c01a2c9f95f3761430df8e39e9 -EBUILD liblastfm-1.0.5.ebuild 1201 SHA256 a1b85a46548facda84b34d87940eaf5f61e7830541984269913e6972ff7de3fd SHA512 20ef33816fc0b1513a2bcc568d0f7671bef62676ecab6d6e08f577796f659366b8422f461642732adfcbfea47538c2ede5a8f08c756b3aa7cf1ba38c3aabfa2b WHIRLPOOL 42b91a01254779816d09f3a9cc3ce1f7a3be81e2934d0e13a31a6c02d967e45d1cb6faa8459d537057e25adf367b58600871abfd51ef127e0e528ed22a34547a -MISC ChangeLog 2741 SHA256 0803010e26b7ee481d6bfb83e04b0b10d2f221a5acc753e931c98b9a35900d4c SHA512 6abe41f994405b9e2e2293a5354e107726f0c0e34bdbf65afe426ba718979911fc230f4b201edf5525119ab0d5910074b54694c0fc5d188b3ca48e4e6160c37a WHIRLPOOL 28de8fdce25632f84d52ad10ed5ceee1a084911922b4aac31ea57bd25fd4a9749318e96c8f92a93e1f884a7a5626a7d5f94c83e4d21c644643f3e908615e0114 -MISC metadata.xml 239 SHA256 ffc2ad8555ecf94e5766aa9840534cfb87948d25352f244f1997b50b69de3ad1 SHA512 1c89e107bc491f92eb4593adfa867977e0da92f3ecfac61e70705b03d8d321c14019f225e11e99462b620eb29cc9556abe22f301bdbc4573b61906ba739132ee WHIRLPOOL 788db8266e5831b69d1716ee90a9d24edc8ef885bc9d049aa131bf3537ea4f5da5a87c046f97343f062f9f3b45bf51791f011afb747ab6b8f7a172059d0564d4 diff --git a/media-libs/liblastfm/liblastfm-1.0.5.ebuild b/media-libs/liblastfm/liblastfm-1.0.5.ebuild deleted file mode 100644 index 144454f7..00000000 --- a/media-libs/liblastfm/liblastfm-1.0.5.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.3.ebuild,v 1.1 2012/10/22 19:17:39 johu Exp $ - -EAPI=4 - -QT_MINIMAL="4.8.0" -inherit cmake-utils -LFMD_VER="2.1.30" - -DESCRIPTION="Collection of libraries to integrate Last.fm services" -HOMEPAGE="http://github.com/eartle/liblastfm" -SRC_URI="http://cdn.last.fm/client/Linux/Last.fm-${LFMD_VER}.tar.bz2" -#SRC_URI="http://cdn.last.fm/client/${P}.tar.gz" - -LICENSE="GPL-3" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -SLOT="0" -IUSE="fingerprint test" - -COMMON_DEPEND=" - >=x11-libs/qt-core-${QT_MINIMAL}:4 - >=x11-libs/qt-dbus-${QT_MINIMAL}:4 - fingerprint? ( - media-libs/libsamplerate - sci-libs/fftw:3.0 - >=x11-libs/qt-sql-${QT_MINIMAL}:4 - ) -" -DEPEND="${COMMON_DEPEND} - test? ( >=x11-libs/qt-test-${QT_MINIMAL}:4 ) -" -RDEPEND="${COMMON_DEPEND} - ! - - -kde - - Build the lastfm-fingerprint library - - diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog deleted file mode 100644 index f78c904e..00000000 --- a/media-sound/lastfmplayer/ChangeLog +++ /dev/null @@ -1,367 +0,0 @@ -# ChangeLog for media-sound/lastfmplayer -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.71 2012/08/26 00:36:09 hwoarang Exp $ - - 26 Aug 2012; Markos Chandras - -lastfmplayer-1.5.4.27091-r1.ebuild, lastfmplayer-1.5.4.27091-r3.ebuild: - Stabilize everywhere to promote the desktop file fix to the stable tree. - Remove old - - 01 Aug 2012; Markos Chandras - -files/fix_plugin_path.patch: - remove old file - -*lastfmplayer-1.5.4.27091-r3 (14 Jul 2012) - - 14 Jul 2012; Markos Chandras - +lastfmplayer-1.5.4.27091-r3.ebuild, -lastfmplayer-1.5.4.27091-r2.ebuild: - Fix desktop icon TryExec option. Thanks to Michael Palimaka - - - 26 Jun 2012; Markos Chandras - +files/lastfmplayer-1.5.4.27091-gcc47.patch, - lastfmplayer-1.5.4.27091-r2.ebuild: - Fix compilation with gcc-4.7. Bug #423221 - - 25 Apr 2012; Justin Lecher - lastfmplayer-1.5.4.27091-r2.ebuild, - +files/lastfmplayer-1.5.4.27091-glib.h.patch: - Add fix for >glib-2.32 - -*lastfmplayer-1.5.4.27091-r2 (30 Dec 2011) - - 30 Dec 2011; Markos Chandras - +lastfmplayer-1.5.4.27091-r2.ebuild: - Allow arguments when launching lastfm from desktop file. Bug #395277 - - 07 Aug 2011; Markos Chandras - -lastfmplayer-1.5.4.26862-r3.ebuild, -lastfmplayer-1.5.4.27091.ebuild: - ^ - - 07 Aug 2011; Kacper Kowalik - lastfmplayer-1.5.4.27091-r1.ebuild: - ppc stable wrt #358551 - - 11 Apr 2011; Pawel Hajdan jr - lastfmplayer-1.5.4.27091-r1.ebuild: - x86 stable wrt bug #358551 - - 13 Mar 2011; Markos Chandras - lastfmplayer-1.5.4.27091-r1.ebuild: - Stable on amd64 wrt bug #358551 - - 25 Jan 2011; Christian Faulhammer - lastfmplayer-1.5.4.26862-r3.ebuild: - stable x86, security bug 352608 - - 24 Jan 2011; Kacper Kowalik - lastfmplayer-1.5.4.26862-r3.ebuild: - ppc stable wrt #352608 - - 24 Jan 2011; Markos Chandras - lastfmplayer-1.5.4.26862-r3.ebuild: - Stable on amd64 wrt bug #352608 - -*lastfmplayer-1.5.4.27091-r1 (24 Jan 2011) - - 24 Jan 2011; Markos Chandras - +lastfmplayer-1.5.4.27091-r1.ebuild, - +files/lastfmplayer-extensions-path.patch: - Add new 'dbus' use flag to support dbus extension. See - http://www.last.fm/forum/21716/_/397336 for more info. This plugin supports - both dbus and mpris interfaces - -*lastfmplayer-1.5.4.27091 (23 Jan 2011) - - 23 Jan 2011; Markos Chandras - +lastfmplayer-1.5.4.27091.ebuild: - New bugfix release. Using patches from - http://www.mehercule.net/staticpages/index.php/lastfm. - -*lastfmplayer-1.5.4.26862-r3 (23 Jan 2011) - - 23 Jan 2011; Markos Chandras - +lastfmplayer-1.5.4.26862-r3.ebuild: - Revision bump using new Debian patchset - Changelog: http://packages.debian.org/changelogs/pool/main/l/lastfm/current/changelog - Security Fix: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3362 - - 26 Oct 2010; Markos Chandras - -lastfmplayer-1.5.4.26862-r1.ebuild: - Remove old ebuild - - 24 Oct 2010; Brent Baude - lastfmplayer-1.5.4.26862-r2.ebuild: - stable ppc, bug 339234 - - 10 Oct 2010; Markus Meier - lastfmplayer-1.5.4.26862-r2.ebuild: - add ~arm, bug #334517 - - 05 Oct 2010; Markus Meier - lastfmplayer-1.5.4.26862-r2.ebuild: - x86 stable, bug #339234 - - 04 Oct 2010; Markos Chandras - lastfmplayer-1.5.4.26862-r2.ebuild: - Stable on amd64 wrt bug #339234 - - 03 Oct 2010; Markos Chandras - -files/volumeslider_h-qt45.patch: - Remove obsolete files - - 14 Sep 2010; Markos Chandras - lastfmplayer-1.5.4.26862-r1.ebuild, lastfmplayer-1.5.4.26862-r2.ebuild: - Fix typo on elog message. Bug #336798. Thanks to Marco Paolone - for reporting - -*lastfmplayer-1.5.4.26862-r2 (26 Aug 2010) - - 26 Aug 2010; Markos Chandras - lastfmplayer-1.5.4.26862-r1.ebuild, +lastfmplayer-1.5.4.26862-r2.ebuild: - Drop RESTRICT=mirror from ebuilds. Put files on our mirrors. Revbump to - apply latest debian patchset. Bug #334695 - - 14 Jul 2010; Markos Chandras - -lastfmplayer-1.5.1.31879-r3.ebuild, -lastfmplayer-1.5.4.26862.ebuild: - Remove old ebuilds - - 14 Jul 2010; Christian Faulhammer - lastfmplayer-1.5.4.26862-r1.ebuild: - stable x86, bug 325321 - - 27 Jun 2010; lastfmplayer-1.5.4.26862-r1.ebuild: - ppc stable #325321 - - 24 Jun 2010; Pacho Ramos - lastfmplayer-1.5.4.26862-r1.ebuild: - stable amd64, bug 325321 - -*lastfmplayer-1.5.4.26862-r1 (07 Jun 2010) - - 07 Jun 2010; Markos Chandras - +lastfmplayer-1.5.4.26862-r1.ebuild: - Fix pkg_postinst message wrt bug #322963. Thanks to Matthias Langer - - -*lastfmplayer-1.5.4.26862 (24 May 2010) - - 24 May 2010; Markos Chandras - +lastfmplayer-1.5.4.26862.ebuild, +files/fix_plugin_path.patch: - Version bump. Ebuild almost have been rewritten. Use debian tarball and - patches + a custom patch to install plugins into different location and - support multilib profiles. Fixes bug #321211 as well. - - 02 Nov 2009; Markus Meier - lastfmplayer-1.5.1.31879-r3.ebuild: - amd64/x86 stable, bug #291023 - - 01 Nov 2009; nixnut - lastfmplayer-1.5.1.31879-r3.ebuild: - ppc stable #291023 - - 11 May 2009; Samuli Suominen - lastfmplayer-1.5.1.31879-r3.ebuild: - Respect CC and CXX wrt #246621, thanks to Steve Dibb. - - 29 Mar 2009; Markos Chandras - -lastfmplayer-1.4.2.58240.ebuild, -lastfmplayer-1.4.2.58240-r1.ebuild: - Removing 1.4.2* versions of lastfmplayer - - 24 Mar 2009; Markos Chandras metadata.xml: - I am taking over this package as discussed with genstef - -*lastfmplayer-1.5.1.31879-r3 (22 Mar 2009) - - 22 Mar 2009; Markos Chandras - -files/makefile-qt45.patch, +files/volumeslider_h-qt45.patch, - -lastfmplayer-1.5.1.31879-r2.ebuild, +lastfmplayer-1.5.1.31879-r3.ebuild: - New patch for qt-4.5 compatibility. Removing old ebuild due to ugly - workaround - -*lastfmplayer-1.5.1.31879-r2 (17 Feb 2009) - - 17 Feb 2009; Markos Chandras - +files/makefile-qt45.patch, +lastfmplayer-1.5.1.31879-r2.ebuild: - Use EAPI2,fixed doc installation, fixed Qt4 dependencies, fixed bug - #258862 - -*lastfmplayer-1.5.1.31879-r1 (11 Dec 2008) - - 11 Dec 2008; Ben de Groot - +lastfmplayer-1.5.1.31879-r1.ebuild: - Add ipod useflag. Thanks to Artur Maciag in bug 249189 for the patch. - -*lastfmplayer-1.5.1.31879 (16 Jul 2008) - - 16 Jul 2008; Ben de Groot - lastfmplayer-1.4.2.58240.ebuild, lastfmplayer-1.4.2.58240-r1.ebuild, - +lastfmplayer-1.5.1.31879.ebuild: - Version bump (#224167) and split Qt4 deps (#222705). - - 27 Jun 2008; Steve Dibb - lastfmplayer-1.4.2.58240-r1.ebuild: - Fix multilib issues, bug 216604 - - 05 Apr 2008; Stefan Schweizer - lastfmplayer-1.4.2.58240-r1.ebuild: - Fix doins -> doins -r, also use mv instead of cp to be faster and catch - symlinks, add sharutils to DEPEND - -*lastfmplayer-1.4.2.58240-r1 (02 Apr 2008) - - 02 Apr 2008; Stefan Schweizer - +lastfmplayer-1.4.2.58240-r1.ebuild: - Use debian package to reduce download size dramatically and also install - i18n, bug 215635 - - 11 Mar 2008; Stefan Schweizer - lastfmplayer-1.4.2.58240.ebuild: - fix deps, bug 206860 - - 29 Feb 2008; Carsten Lohrke - lastfmplayer-1.4.2.58240.ebuild: - Remove icon extension from desktop entry to match Icon Theme Specification. - -*lastfmplayer-1.4.2.58240 (19 Jan 2008) - - 19 Jan 2008; Stefan Schweizer - -lastfmplayer-1.3.1.0.ebuild, -lastfmplayer-1.3.2.13.ebuild, - -lastfmplayer-1.4.1.57486.ebuild, +lastfmplayer-1.4.2.58240.ebuild: - Version bump thanks to Allen Brooker (AllenJB) - in bug 206597 - -*lastfmplayer-1.4.1.57486 (22 Dec 2007) - - 22 Dec 2007; Stefan Schweizer - +files/lastfmplayer-mad-asneeded.patch, +lastfmplayer-1.4.1.57486.ebuild: - version bump thanks to Geert Lamers in bug 202861 - -*lastfmplayer-1.3.2.13 (16 Nov 2007) - - 16 Nov 2007; Stefan Schweizer - +lastfmplayer-1.3.2.13.ebuild: - version bump thanks to Allen Brooker (AllenJB) - and Sebastian Krämer in bug 197083 - -*lastfmplayer-1.3.1.0.ebuild (29 Aug 2007) - - 29 Aug 2007; Stefan Schweizer - -files/lastfmplayer-1.1.3-mp3transcode.patch, - -files/lastfmplayer-amd64.patch, -files/lastfmplayer-1.1.3-pic.patch, - -files/13_alsa-r1.diff, -files/qt4.patch, -lastfmplayer-1.1.3-r2.ebuild, - -lastfmplayer-1.3.0.58.ebuild, lastfmplayer-1.3.1.0.ebuild: - remove old, use eqmake4 thanks Davide Pesavento in - bug 189641 - -*lastfmplayer-1.3.1.0 (27 Jul 2007) - - 27 Jul 2007; Piotr Jaroszyński - +lastfmplayer-1.3.1.0.ebuild: - Add 1.3.1.0. - - 04 Jul 2007; Joseph Jezak - -files/lastfmplayer-1.3.0.58-mp3transcode.patch, - lastfmplayer-1.3.0.58.ebuild: - Removed mp3transcode patch for 1.3.0.58. - - 02 Jul 2007; Piotr Jaroszyński - lastfmplayer-1.1.3-r2.ebuild, lastfmplayer-1.3.0.58.ebuild: - (QA) RESTRICT clean up. - - 28 Jun 2007; Joseph Jezak - +files/lastfmplayer-1.1.3-mp3transcode.patch, - +files/lastfmplayer-1.3.0.58-mp3transcode.patch, - lastfmplayer-1.1.3-r2.ebuild, lastfmplayer-1.3.0.58.ebuild: - Added ppc endian patch from Albert Zeyer, fixes bug #181288. Marked ~ppc. - -*lastfmplayer-1.3.0.58 (27 Jun 2007) - - 27 Jun 2007; Stefan Schweizer - +lastfmplayer-1.3.0.58.ebuild: - version bump thanks to Serkan Kaba in bug 183106 - -*lastfmplayer-1.1.3-r2 (22 May 2007) - - 22 May 2007; Stefan Schweizer - -lastfmplayer-1.1.3-r1.ebuild, +lastfmplayer-1.1.3-r2.ebuild: - Fix wrapper to kill hanging processes prior to starting thanks to Heiko - Baums in bug 178590 - - 14 May 2007; Stefan Schweizer +files/qt4.patch, - -lastfmplayer-1.0.0.1_p2113.ebuild, lastfmplayer-1.1.3-r1.ebuild: - Fix qt4.3 version bug thanks to Peter Gantner (a.k.a. nephros) - and Heiko Baums in bug 177932 - - 01 May 2007; Marius Mauch - lastfmplayer-1.0.0.1_p2113.ebuild, lastfmplayer-1.1.3-r1.ebuild: - Replacing einfo with elog - -*lastfmplayer-1.1.3-r1 (20 Mar 2007) - - 20 Mar 2007; Stefan Schweizer +files/13_alsa-r1.diff, - -lastfmplayer-1.1.3.ebuild, +lastfmplayer-1.1.3-r1.ebuild: - Fix Alsa issues thanks to David Grant in bug 167229 - - 12 Feb 2007; Simon Stelling - +files/lastfmplayer-1.1.3-pic.patch, lastfmplayer-1.1.3.ebuild: - fix fPIC issues; bug 166451 - -*lastfmplayer-1.1.3 (11 Feb 2007) - - 11 Feb 2007; +lastfmplayer-1.1.3.ebuild: - version bump thanks to Jouni Rinne in bug 164044 - - 04 Nov 2006; Stefan Schweizer - lastfmplayer-1.0.0.1_p2113.ebuild: - use a snapshot instead of svn, fixes bug 153184 - - 22 Sep 2006; Stefan Schweizer - lastfmplayer-1.0.0.1_p2113.ebuild: - Ebuild info fixes and changes thanks to Alexander Skwar - and David Li in bug - 148574 - - 31 Aug 2006; Stefan Schweizer - lastfmplayer-1.0.0.1_p2113.ebuild: - Add -j1 thanks to David Grant and Lars Strojny - in bug 144253 - - 05 Aug 2006; Stefan Schweizer - lastfmplayer-1.0.0.1_p2113.ebuild: - Add proper debugging support thanks to Santiago M. Mola Velasco - in bug 142875 - - 28 Jul 2006; Stefan Schweizer - +files/lastfmplayer-amd64.patch, lastfmplayer-1.0.0.1_p2113.ebuild: - Add patch to allow compiling on amd64 again thanks to Mehmet Kemal EROL - and David Li in bug 141729 - -*lastfmplayer-1.0.0.1_p2113 (23 Jul 2006) - - 23 Jul 2006; Stefan Schweizer - +lastfmplayer-1.0.0.1_p2113.ebuild, -lastfmplayer-1.2_pre2099.ebuild: - version bump thanks to David Li in bug 141351 - - 02 Jun 2006; Stefan Schweizer - lastfmplayer-1.2_pre2099.ebuild: - Add browser-setting information thanks to Pietro Franchi - in bug 135279 - -*lastfmplayer-1.2_pre2099 (27 Apr 2006) - - 27 Apr 2006; Stefan Schweizer +files/lastfm.protocol, - -lastfmplayer-1.1.4_p2099.ebuild, +lastfmplayer-1.2_pre2099.ebuild: - Version bump thanks to Nicholas Doyle in bug 131400, - kde services file thanks to Heiko Baums in bug - 129335 - - 02 Apr 2006; Stefan Schweizer - lastfmplayer-1.1.4_p2099.ebuild: - remove oss USEflag thanks to Ryan Hill in bug 128581 - -*lastfmplayer-1.1.4_p2099 (02 Apr 2006) - - 02 Apr 2006; Stefan Schweizer +metadata.xml, - +lastfmplayer-1.1.4_p2099.ebuild: - New ebuild thanks to David Li in bug 102059 diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest deleted file mode 100644 index 706f5f28..00000000 --- a/media-sound/lastfmplayer/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX lastfmplayer-2.1.30-glib.h.patch 477 SHA256 1bf930e8413ccf3b045aebf555dd59d7f14e557c6754c3da716b90835b113c62 SHA512 f7e8162c3330825e7ba999d048f420641b6983d36e6b9642fb7d51e93043d26dfadfc08aff48e9872082a7f33bf4e4d050128db69fde3d92bc6aefb62b363737 WHIRLPOOL a21f885986da7918effac355b537e39510272598550bccaff45d3b1ad92f5afd535e23f79278a8aca6f665b2fe32f99b13a3461f78947fbd3e14aaae17b80005 -AUX lastfmplayer-extensions-path.patch 1507 SHA256 4ec6beecbe5de40937b148ac72bc7d52a81f7636c8ef11b1a821db6488578153 SHA512 aaaed7a58cb21b511d1b75feb21b30b907c84943f1306c14c3f66d64a197c91b26389b3f29c7b7fe3eadbbbdfd53658619188eef31d9712a1fa3b602acd31c75 WHIRLPOOL e1fe341ac365e930deae4288ae62dd43ada1093d93f999a4bb8aff8c01b72fa76a827cc0f37fbf9cf6a1662cdd652b5efdeda99ded8bf670bf6e44c4a05fac49 -DIST Last.fm-2.1.30.tar.bz2 5970748 SHA256 a8591930af2c76100840fa94082e831d5aeb2893c264528a15ec5151bf0cc2a4 SHA512 8a0ad9eda290a0a7d5d93f7a8fef505061c28101d1c6fc970d495a0cdca1fd9c90bdea6c4fe807161aee8ec940fdd9b94603834af3bf4d172d3b89fde1335cb6 WHIRLPOOL 75dad774538074c7e3ad4e7a41eec08f4a7425ace90daca8abda3b1b256f86655ec89e8624c85fbfbb93e0afffe4f63a4f5752c01a2c9f95f3761430df8e39e9 -DIST dbusextension-2.0.tar.bz2 11101 SHA256 db9f5040b593886a36ec409bb1e5b96f2225132207c841cc0b3c15c6242741d2 SHA512 f277a8e4452f2d80b93111ef956f54999881d44df6beaf4294a8dc9468c5f6c2660bbd34f7d363c0541e2f46078fd6ab311b6d30547f5369fe84be1045f849f8 WHIRLPOOL e2c8aef7e8112fb3959f653a53861da5ba77f57c33ea4cafe157f8e060e98362acd8220602bc2ffae7c9437526df902fd10c5c5b5f4175bcbc9c2b1bddc988e5 -EBUILD lastfmplayer-2.1.30.ebuild 4668 SHA256 cbac722e7816dfe9fafe9a5c6802c5d3baf71263a6f57d84f84aed3b2d54e452 SHA512 2d23be0156eb3d8c4e12e9f733e42c8960f138b8a0714041524b964b20727e944d19d9fb35fe918130096369973ae59e2ce191ed760e82f54981497b8df6ef3c WHIRLPOOL 2e4087b0e5d8ff983ee6cefa15e9245d5a2127adb47d26ee49d5308a02cd78ae4eadd982acb161f4496686908c5f3a48d99127fd0861037f3032c3f5ec9dc045 -MISC ChangeLog 13602 SHA256 e4a417093a15c4b36f5cff97f7e431e6085b1a42f0acc501bf3e5840b129b184 SHA512 e1754dbd5f8eaf9e1b3b6943fdbf955063a50afcabf56af1799ee3f0e1dcd2a0a657f14479d92f4f9860432e6fe9b2f839455372df494ea418466d5278b06815 WHIRLPOOL 725316744d94adf620c60fbd0758556a4a93ff5d15a88ac54262e19682864734111a614a3d4d0573b3d9e59a789dbef3528277de42167fc30b7bd9286502a58b -MISC metadata.xml 251 SHA256 12a2bce19c4087d3496fe929a182659413c12565c7dad8a4ddad9d2e6c73d8a7 SHA512 95b129d3aadb4aa9c206f00123fb0a5b2da85737094fd703dca472786e4def0e503c6dae2376d704fc971baff3a3037cfe615932dc992d4fdada8eb93c0ee09f WHIRLPOOL 120f551446436a80a990a46ecfda7f4aaef9ff759f0736887bcb0d8623f7a0820420e68f3a0bc83f37f9516d6bddb6f0725cc4c7e7f1085135ef1a625823ba9c diff --git a/media-sound/lastfmplayer/files/lastfmplayer-2.1.30-glib.h.patch b/media-sound/lastfmplayer/files/lastfmplayer-2.1.30-glib.h.patch deleted file mode 100644 index 72ba9216..00000000 --- a/media-sound/lastfmplayer/files/lastfmplayer-2.1.30-glib.h.patch +++ /dev/null @@ -1,16 +0,0 @@ - src/mediadevices/ipod/IpodDevice.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/mediadevices/ipod/IpodDevice.cpp b/app/client/MediaDevices/IpodDevice_linux.cpp -index 3e40672..f3bad0e 100644 ---- a/src/mediadevices/ipod/IpodDevice.cpp -+++ b/app/client/MediaDevices/IpodDevice_linux.cpp -@@ -35,7 +35,7 @@ - extern "C" - { - #include -- #include -+ #include - } - - #define TABLE_NAME "IpodDeviceTracks" diff --git a/media-sound/lastfmplayer/files/lastfmplayer-extensions-path.patch b/media-sound/lastfmplayer/files/lastfmplayer-extensions-path.patch deleted file mode 100644 index 6805dd0e..00000000 --- a/media-sound/lastfmplayer/files/lastfmplayer-extensions-path.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: lastfm-1.5.4.27091+dfsg/definitions.pro.inc -=================================================================== ---- lastfm-1.5.4.27091+dfsg.orig/definitions.pro.inc -+++ lastfm-1.5.4.27091+dfsg/definitions.pro.inc -@@ -10,7 +10,7 @@ CONFIG( service ) { - CONFIG += plugin - - win32: DESTDIR = $$BIN_DIR -- else: DESTDIR = $$BIN_DIR/services -+ else: DESTDIR = $$BIN_DIR/lastfm_services - - TARGET = srv_$$TARGET - } -@@ -19,7 +19,7 @@ CONFIG( extension ) { - CONFIG += plugin - - win32: DESTDIR = $$BIN_DIR -- else: DESTDIR = $$BIN_DIR/extensions -+ else: DESTDIR = $$BIN_DIR/lastfm_services/extensions - - TARGET = ext_$$TARGET - } -Index: lastfm-1.5.4.27091+dfsg/src/libMoose/MooseCommon.cpp -=================================================================== ---- lastfm-1.5.4.27091+dfsg.orig/src/libMoose/MooseCommon.cpp -+++ lastfm-1.5.4.27091+dfsg/src/libMoose/MooseCommon.cpp -@@ -112,7 +112,7 @@ servicePath( QString name ) - // Hack to get it working with VS2005 - dirPath = qApp->applicationDirPath(); - #else -- dirPath = qApp->applicationDirPath() + "/services"; -+ dirPath = "/usr/lib/lastfm_services"; - #endif - - #ifndef QT_NO_DEBUG -@@ -358,7 +358,7 @@ extensionPaths() - // Hack to get it working with VS2005 - QString path = qApp->applicationDirPath(); - #else -- QString path = qApp->applicationDirPath() + "/extensions"; -+ QString path = "/usr/lib/lastfm_services/extensions"; - #endif - - #ifndef QT_NO_DEBUG diff --git a/media-sound/lastfmplayer/lastfmplayer-2.1.30.ebuild b/media-sound/lastfmplayer/lastfmplayer-2.1.30.ebuild deleted file mode 100644 index 97365e71..00000000 --- a/media-sound/lastfmplayer/lastfmplayer-2.1.30.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild,v 1.2 2012/08/26 00:36:09 hwoarang Exp $ - -EAPI=4 -inherit eutils multilib toolchain-funcs qt4-r2 - -DESCRIPTION="A player for last.fm radio streams" -HOMEPAGE="http://www.last.fm/help/player - http://www.mehercule.net/staticpages/index.php/lastfm" -SRC_URI="http://cdn.last.fm/client/Linux/Last.fm-${PV}.tar.bz2 - dbus? ( http://glue.umd.edu/~rossatok/dbusextension-2.0.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" -IUSE="dbus ipod" - -RDEPEND="x11-libs/qt-gui:4 - x11-libs/qt-sql:4 - media-libs/libsamplerate - sci-libs/fftw - media-libs/libmad - ipod? ( >=media-libs/libgpod-0.5.2 ) - media-libs/alsa-lib - media-libs/liblastfm[fingerprint(+)]" -DEPEND="${RDEPEND} - app-arch/sharutils" - -S=${WORKDIR}/lastfm-desktop-${PV} - -src_prepare() { - qt4-r2_src_prepare - # Use a different extensions path -# epatch "${FILESDIR}"/${PN}-extensions-path.patch -# einfo "Applying Debian patchset" -# sed -i "/^tray-icon-size.diff/d" "${WORKDIR}"/debian/patches/series -# cd "${S}" -# for i in $( < "${WORKDIR}"/debian/patches/series); do -# epatch "${WORKDIR}"/debian/patches/$i -# done -# if ! use ipod ; then -# sed -i '/src\/mediadevices\/ipod/d' LastFM.pro || die "sed failed" -# fi - #fix plugin search path for multilib support -# sed -i -e "s:/usr/lib/:/usr/$(get_libdir)/:g" \ -# "${S}"/src/libMoose/MooseCommon.cpp -# if use dbus; then -# mv "${WORKDIR}"/dbus "${S}"/src/dbus -# sed -i -e "/include/s:../definitions.pro.in:definitions.pro.in:" \ -# -e "/TARGET/s:dbusextension:LastFmDbusExtension:" \ -# "${S}"/src/dbus/dbusextension.pro -# fi - - # only glib.h can be included directly in >glib-2.32 - epatch "${FILESDIR}"/${P}-glib.h.patch -} - -src_configure() { -# if use dbus; then -# pushd "${S}"/src/dbus -# eqmake4 dbusextension.pro -# popd >> /dev/null -# fi - qt4-r2_src_configure -} - -src_compile() { - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed" -# if use dbus; then -# einfo "Building DBUS plugin" -# emake -C "${S}"/src/dbus || die "failed to build dbus extension" -# fi - cd i18n; lrelease *.ts -} - -src_install() { - cd "${WORKDIR}" - # Docs -# dodoc "${S}"/ChangeLog.txt "${S}"/README debian/README.source \ -# || die "dodoc failed" -# doman debian/lastfm.1 || die "doman failed" - - # Copied from debian/rules -# insinto /usr/share -# doins -r debian/package-files/share/icons || die "failed to install icons" -# insinto /usr/share/lastfm/icons -# doins "${S}"/bin/data/icons/*.png \ -# || die "failed to install application icons" -# insinto /usr/share/lastfm -# doins "${S}"/bin/data/*.png || die "failed to install icons" -# dodir /usr/$(get_libdir)/lastfm_services/ -# insinto /usr/$(get_libdir)/lastfm_services/ -# insopts -m0755 -# doins -r "${S}"/bin/lastfm_services/*.so || die "failed to install plugins" -# if use dbus; then -# insinto /usr/$(get_libdir)/lastfm_services/extensions/ -# insopts -m0755 -# doins "${S}"/bin/lastfm_services/extensions/*.so || die -# fi -# insinto /usr/$(get_libdir) -# insopts -m0755 -# doins "${S}"/bin/liblistener.so.1* || die "failed to install library" -# doins "${S}"/bin/liblogger.so.1* || die "failed to install library" -# doins "${S}"/bin/liblogger.so.1* || die "failed to install library" - dolib.so "${S}"/_bin/*.so* - #fix symlinks -# cd "${D}"/usr/$(get_libdir)/ -# ln -sfn libLastFmTools.so.1.0.0 libLastFmTools.so.1 -# ln -sfn libLastFmTools.so.1.0.0 libLastFmTools.so.1.0 -# ln -sfn libMoose.so.1.0.0 libMoose.so.1 -# ln -sfn libMoose.so.1.0.0 libMoose.so.1.0 -# cd "${WORKDIR}" - newbin "${S}"/_bin/Last.fm* lastfm || die "newbin failed" - insinto /usr/share/lastfm/i18n - doins "${S}"/i18n/*.qm || die "failed to install translations" - fperms 755 /usr/bin/lastfm -# rm -f "${D}"/usr/share/lastfm/icons/{*profile24,systray_mac}.png - # create desktop entry -# doicon "${WORKDIR}"/debian/package-files/share/icons/hicolor/48x48/apps/lastfm.png - # Allow arguments when launching application. Bug #395277 - make_desktop_entry lastfm "Last.fm Player" lastfm - sed -i -e "/^Exec/s:lastfm:& %U:" \ - "${D}"/usr/share/applications/lastfm-${PN}.desktop || die -} - -pkg_postinst() { - elog "To use the Last.fm player with a mozilla based browser:" - elog " 1. Install gnome-base/gconf" - elog " 2. gconftool-2 -t string -s \ -/desktop/gnome/url-handlers/lastfm/command \"/usr/bin/lastfm %s\"" - elog " 3. gconftool-2 -s \ -/desktop/gnome/url-handlers/lastfm/needs_terminal false -t bool" - elog " 4. gconftool-2 -t bool -s \ -/desktop/gnome/url-handlers/lastfm/enabled true" - elog - elog "If you experience awkward fonts or widgets, try running qtconfig." -} diff --git a/media-sound/lastfmplayer/metadata.xml b/media-sound/lastfmplayer/metadata.xml deleted file mode 100644 index e1b97884..00000000 --- a/media-sound/lastfmplayer/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - hwoarang@gentoo.org - Markos Chandras - -sound - diff --git a/media-video/ushare/ChangeLog b/media-video/ushare/ChangeLog deleted file mode 100644 index a4d9c3a7..00000000 --- a/media-video/ushare/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for media-video/ushare -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.2 2009/12/29 05:21:57 darkside Exp $ - - 19 Nov 2011; Mario Fetka ushare-1.1a.ebuild: - add mp4 support and move config file to /etc - - 29 Dec 2009; Jeremy Olexa ushare-1.1a.ebuild: - Fix building with USE=nls, bug 298207 - -*ushare-1.1a (23 Dec 2009) - - 23 Dec 2009; Jeremy Olexa +ushare-1.1a.ebuild, - +files/ushare.conf.d, +files/ushare.init.d, +metadata.xml: - Initial import. Many thanks to all the contributors on bug 192561. Moved - from sunrise overlay with modifications by myself - diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest deleted file mode 100644 index 3db2cb01..00000000 --- a/media-video/ushare/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX ushare-mp4-support.patch 605 SHA256 1cf93c0b988725be7b619e6148cafad1f17a3a632949aade7990818620549774 SHA512 f222f1311aaef6b0cf54e6b86008183bf16a8a402486bb7b9c39497ff1a92628a0b5215a498e526e630b5c64c7e7cff3a7ea5fc5627c23bd37c7b795242a001d WHIRLPOOL ad9b2619beab94679086cd98b326cd7777125d109f62c1f0a705a45817f800d3436bdee2adf8522f8089af3bda60949b0befd66749b49488869ad10252c8fd2a -AUX ushare.conf.d 896 SHA256 cf333cc495177828c8a5bf3fde9462190435843ffd51d95ef676c3c6df1c5563 SHA512 60256fdc900c93948120f172722f19e52fc3869952d60fefc25d2728ed14f5e57a0e93eb71613cbc48b83d38cd2c5b4c476fa3e1cd2eeff17204b50c4b6a3b83 WHIRLPOOL f4af8734f15bdb1edb92d0d4eb2793a4a5b9e4c65285bfdef1132b58306f8dcadef48e6e27bfc76ff5be1415fcc0e68d4802dfd776f9af1c5eed0c7915ee018e -AUX ushare.init.d 2164 SHA256 7a8c4c06aacf9a87ae2036df24751a74a29e741a39e89e0c704c63a27ad2a4c2 SHA512 3b8debabbb0c31699d74d9e7f9a15d71ee66cb6b7e1b3704fac74497d2d2e18cc937953e1c700052858e1112437881bcb00d462d1bf7a8a5387524b503e12832 WHIRLPOOL a1626ac3fb2be0645c3d818311a99f1ceb68f6d96e5bc373845b5c748affa53a2e8285f636d8a4668e9bda4472b6009679037dca05887b9c9f4701e7ecd8b7da -DIST ushare-1.1a.tar.bz2 65864 SHA256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665 -EBUILD ushare-1.1a.ebuild 1574 SHA256 c110082da112353c16b1b17eab99735480fc996ed85e3db1f7c77d3f31533a90 SHA512 ea16afaac744dd545f638b8c2cfc78c633a3862617e0df618cce7710808fb69148616e0d9ccdb4b55ddeb4022e42e7b2ba28d15c6a4e4712befd2c78b6f157f4 WHIRLPOOL d2dfa17715bf4c943b3ca4fc3fb84d2c63cd096af6983b4f33ef471da14576cf42342109b9966654ee7ef26413631313e2e0c5254fa8f8412d0dcbd8c99cfac8 -MISC ChangeLog 729 SHA256 c8ad783c918df4b5718057b5a535b73a237a428f0622fb49aabbf011847aa75e SHA512 d7ab76a742785114b725d53deffd4043f6a42c434a0c8e9a278cfc43a544c152a710bc97b6d833a7651234ff44e207c8dbfa35cfc303af82f10d639a838c70b1 WHIRLPOOL d3917d1f4e41aa97c15ca3b46121c6e360951ca4fe22cd57a6a5cdc77b82c2164a7c02fc06e39616a358b8fcac05d36700d47efaf135efedd80eb0ac71346efc -MISC metadata.xml 325 SHA256 24b9cc6b2e1e3c8011e0133aea0e8156bfdf6896f42bac864d444672bc6c9ad3 SHA512 de37683744fed10bd08acb28dca840980935bf75b6004301370e8e9d4cd6c78911a77cec1510bb985d0a11f30f6c5ea7a74acc5412343be735a2273a74d8e7e0 WHIRLPOOL 0a303fc6c310fbdb508cc308f939f5b168ebd82ca44ab536b24999a6cb8baebea1458279e5251e6ccab3823e04645111b273938438cfb42bf6aaa5d69ff5a9dd diff --git a/media-video/ushare/files/ushare-mp4-support.patch b/media-video/ushare/files/ushare-mp4-support.patch deleted file mode 100644 index 83bb3c0a..00000000 --- a/media-video/ushare/files/ushare-mp4-support.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -crB ushare-1.1a-orig/src/mime.c ushare-1.1a/src/mime.c -*** ushare-1.1a-orig/src/mime.c Mon Oct 25 13:21:01 2010 ---- ushare-1.1a/src/mime.c Mon Oct 25 13:21:45 2010 -*************** -*** 53,58 **** ---- 53,59 ---- - { "mpeg2", UPNP_VIDEO, "http-get:*:video/mpeg2:"}, - { "m4v", UPNP_VIDEO, "http-get:*:video/mp4:"}, - { "m4p", UPNP_VIDEO, "http-get:*:video/mp4:"}, -+ { "mp4", UPNP_VIDEO, "http-get:*:video/mp4:"}, - { "mp4ps", UPNP_VIDEO, "http-get:*:video/x-nerodigital-ps:"}, - { "ts", UPNP_VIDEO, "http-get:*:video/mpeg2:"}, - { "ogm", UPNP_VIDEO, "http-get:*:video/mpeg:"}, diff --git a/media-video/ushare/files/ushare.conf.d b/media-video/ushare/files/ushare.conf.d deleted file mode 100644 index d225b8f3..00000000 --- a/media-video/ushare/files/ushare.conf.d +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/files/ushare.conf.d,v 1.1 2009/12/23 22:27:37 darkside Exp $ - -# User to run ushare daemon (if none, root will be used) -USHARE_USER="ushare" - -# UPNP Friendly Name: -USHARE_NAME="uShare" - -# The interface to bind to: -USHARE_IFACE="eth0" - -# Static ushare port: -USHARE_PORT="" - -# Enable/Disable telnet: -USHARE_TELNET="yes" - -# Choose different telnet port: -USHARE_TELNET_PORT="" - -# Enable/Disable web component: -USHARE_WEB="yes" - -# A List of directories to share, each precieded by '-c': -USHARE_DIRS="" - -# Enable/Disable XboX 360 compliant profile: -USHARE_XBOX="no" - -# Enable/Disable DLNA compliant profile (Playstation3 requires this): -USHARE_DLNA="no" - -# Misc. options: -USHARE_OPTS="" - -# Check ushare --help or man ushare for more options. diff --git a/media-video/ushare/files/ushare.init.d b/media-video/ushare/files/ushare.init.d deleted file mode 100644 index fb6be7d9..00000000 --- a/media-video/ushare/files/ushare.init.d +++ /dev/null @@ -1,79 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/files/ushare.init.d,v 1.1 2009/12/23 22:27:37 darkside Exp $ - -depend() { - use net -} - -start() { - ebegin "Starting uShare" - - # Sanity check to avoid ushare failling on booting with no - # shared dirs - if [[ -z "${USHARE_DIRS}" ]] ; then - eerror "Please set shared dirs in /etc/conf.d/ushare" - return 1 - fi - - if [[ -z "${USHARE_PORT}" ]] ; then - einfo "${USHARE_NAME} runs on a dynamic port" - local ushare_port= - else - local ushare_port="--port ${USHARE_PORT}" - einfo "${USHARE_NAME} using port ${USHARE_PORT}" - fi - - if [[ "${USHARE_TELNET}" == "yes" ]] ; then - local ushare_telnet= - else - local ushare_telnet="--no-telnet" - fi - - if [[ -z "${ushare_telnet}" ]] ; then - if [[ -z "${USHARE_TELNET_PORT}" ]] ; then - local ushare_telnet_port= - einfo "${USHARE_NAME} runs telnet on the default port" - else - local ushare_telnet_port="--telnet-port ${USHARE_TELNET_PORT}" - einfo "${USHARE_NAME} runs telnet on port ${USHARE_TELNET_PORT}" - fi - else - local ushare_telnet_port= - fi - - if [[ "${USHARE_WEB}" == "yes" ]] ; then - local ushare_web= - else - local ushare_web="--no-web" - fi - - if [[ "${USHARE_XBOX}" == "yes" ]] ; then - local ushare_xbox="--xbox" - else - local ushare_xbox= - fi - - if [[ "${USHARE_DLNA}" == "yes" ]] ; then - local ushare_dlna="--dlna" - else - local ushare_dlna= - fi - - start-stop-daemon --start --quiet -c ${USHARE_USER:-root} \ - --exec /usr/bin/ushare -- -D -i ${USHARE_IFACE} \ - -n ${USHARE_NAME} ${USHARE_OPTS} ${USHARE_DIRS} \ - ${ushare_port} \ - ${ushare_telnet} ${ushare_telnet_port} \ - ${ushare_web} \ - ${ushare_xbox} \ - ${ushare_dlna} - eend $? -} - -stop() { - ebegin "Stopping uShare" - start-stop-daemon --stop --quiet --exec /usr/bin/ushare - eend $? -} diff --git a/media-video/ushare/metadata.xml b/media-video/ushare/metadata.xml deleted file mode 100644 index 15d401e0..00000000 --- a/media-video/ushare/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - video - - darkside@gentoo.org - - - Add DLNA (media-libs/libdlna) support - - diff --git a/media-video/ushare/ushare-1.1a.ebuild b/media-video/ushare/ushare-1.1a.ebuild deleted file mode 100644 index f87137d4..00000000 --- a/media-video/ushare/ushare-1.1a.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a.ebuild,v 1.2 2009/12/29 05:21:57 darkside Exp $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server" -HOMEPAGE="http://ushare.geexbox.org/" -SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dlna nls" - -RDEPEND="net-libs/libupnp - dlna? ( media-libs/libdlna )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}/ushare-mp4-support.patch" - - elog "Replacing Original init.d File" - sed -i \ - -e '/(INSTALL) -d $(sysconfdir)\/init\.d/d' \ - -e '/$(INSTALL) -m 755 $(INITD_FILE) $(sysconfdir)\/init.d/d' \ - scripts/Makefile || die -} - -src_configure() { - local myconf - - myconf="--prefix=/usr --sysconfdir=/etc --disable-strip $(use_enable dlna)" - # nls can only be disabled, on by default. - use nls || myconf="${myconf} --disable-nls" - - ./configure ${myconf} || die "Configure failed" -} - -src_compile() { - emake || die "Make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - doman src/ushare.1 || die - newconfd "${FILESDIR}"/ushare.conf.d ushare || die - newinitd "${FILESDIR}"/ushare.init.d ushare || die - dodoc NEWS README TODO THANKS AUTHORS || die -} - -pkg_postinst() { - enewuser ushare - elog "Please edit /etc/conf.d/ushare to set the shared directories" - elog "and other important settings. Check system log if ushare is" - elog "not booting." -} diff --git a/net-misc/nx-X11/ChangeLog b/net-misc/nx-X11/ChangeLog deleted file mode 100644 index e6aac69a..00000000 --- a/net-misc/nx-X11/ChangeLog +++ /dev/null @@ -1,25 +0,0 @@ -# ChangeLog for net-misc/nx-X11 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 28 Aug 2010; Mario Fetka -nx-X11-3.4.0_p3.ebuild, - files/01_build_nx-X11_without_nxcomp.dpatch, - files/02_dont_build_nxcompshad.dpatch, files/85_nx-X11_debian-ld.dpatch, - +files/86_set_rgb_path.dpatch, +files/87_set_securitypolicy_path.dpatch, - +files/90_set_X0-config_path.dpatch, +files/91_enable_debug.dpatch, - +files/93_export_remote_keyboard_config.dpatch, - +files/createpixmap_bounds_check.patch, +files/nx-X11-dimbor.patch, - +files/nx-X11-utf8_copy_clipboard.patch, +nx-X11-3.4.0_p4.ebuild, - +files/nxa_wine_close_delay.patch, +files/nxagent.1, - +files/nxagent.MotifWMHints_Utf8Names.dimbor.patch, - +files/nxagent.keyboard, +files/rgb, +files/unbranded.diff: - Bump - - 14 Jun 2010; Mario Fetka +nx-X11-3.4.0_p3.ebuild, - +files/02_dont_build_nxcompshad.dpatch, - +files/nx-X11-3.4.0-Imake-fix-1.patch, - +files/01_build_nx-X11_without_nxcomp.dpatch, - +files/85_nx-X11_debian-ld.dpatch, +files/nx-x11-1.5.0-tmp-exec.patch, - +files/95_fix_Imakefile.dpatch, +metadata.xml: - Initial checkin - diff --git a/net-misc/nx-X11/Manifest b/net-misc/nx-X11/Manifest deleted file mode 100644 index 4288d250..00000000 --- a/net-misc/nx-X11/Manifest +++ /dev/null @@ -1,26 +0,0 @@ -AUX 01_build_nx-X11_without_nxcomp.dpatch 1107 SHA256 86e176ac2f89da8ea2eebe20f798f994c581ad3d2351358c3b7662d492cd7ad2 SHA512 b1b2588017c8198bd81caa1481089f97efd9d94dc4258360e902f6b2b84c519888efc2a4870bee9e1d489f787efc025fede5eef0ee29c617de6f1bcd401b0f91 WHIRLPOOL 7d5309487973934787ed024a75a43c73320c81a1e61fae1b7924d671d55f6151f0ffff843aa44b05e26843b5a380f13f68a00d7eeab2e047dc8d8373e03f31cc -AUX 02_dont_build_nxcompshad.dpatch 872 SHA256 35ff04cde0cf28b3245d936a3b5dbb937731ea229999375a7032cbdda3974f5c SHA512 7dcc9f53c0d675048c3c156a0aa2827de64f2557ee678def4418b48f88731b68e33e5903a927c0706b23525b9def8f0366224ce83b5642254cdf881e1196dec3 WHIRLPOOL 292a8778036717cdc28fb29649088c15d8be738a124615787d1b85da2bb77c3f2077a7ea9dedb43ae62743a4438a90ae53be672d8d28aeafe69acae2883fd5ee -AUX 85_nx-X11_debian-ld.dpatch 4629 SHA256 bffa666e7bfec0cc44e32745f53518bc2e9bf54d3bb8ee28bfb7bec01dabad84 SHA512 a6d661f6f30090c372f7bde0be0e336389af63f9b3cf2557888b50625d7d7e1a5db24c56e2ac05a2f1e43ba8a787831d3af5fac23eae31ff172a4d8c026b3679 WHIRLPOOL 3502065f8c3197141a9bdf90e922f8c36219fb0626f1f7190bd3f3136625ef6a01cd4830a26a8cb411f3357a120aff3e2b0e4d8d362c744d869af6fca334d916 -AUX 86_set_rgb_path.dpatch 608 SHA256 1763b0997120c5e3fbcce53c4339713e7c69fe0cb4660e1acde601cf93872de3 SHA512 2ca0e157305381e362b65e1242514c7eec6fbd16de1fc4d7799307f5dc1279ce37d73fccb3da71d8bd820a0b16b3975ac44724004117e307ea0b44579060ed44 WHIRLPOOL 84c7bdc293cae40fc70e4e4ff0e464f979675c7a1ba052d1bd9ea9fb7e2d68b9cef70d0838c70a58cf9ad871146dde185a9909c1f1dc9e733069f3271f3baafc -AUX 87_set_securitypolicy_path.dpatch 492 SHA256 9763f4180c3089a2273062fa2cf7e6532dab4afa7787a509e61dd53515b050dd SHA512 be57dc25858fa9fba9e76bc3fb7eb31b353995f57419b20afb0a3a1ad01f6b3d4e23675258091766f4cbbe8851f9e2d16d9602c25ef0063deadad444317efe7f WHIRLPOOL 2a39d597347e592a0494e67f2d44d24d918a828cc7b54e19ee1dbebbaf2f5ff06220431e7b352e379a6d19ec3119e64ad99dd7599af48c2acddd13dc399375e0 -AUX 90_set_X0-config_path.dpatch 1238 SHA256 e9054622e2400e6311378c18c2e137b154d9aa3d6ac9220977d916b307f86f28 SHA512 c68bcb70342f03279fd1fe6a8073cca6fcefe27e330e23813e30e3b4db4b8fe83133a2e727a7173fd85ecae49ed22db72d49fda6cdd2bd815da8fe7747d7b396 WHIRLPOOL 62873329bb21c1ea936213ac15ad0150b65019f5e7d25409bc170f716e6d4334209cded88dd99a12538747ce76e751670c171e8b11e664cde787dd6ef7737be9 -AUX 91_enable_debug.dpatch 757 SHA256 e1ca117a64b5504b96c7e5b44b3c44aa5cfcf11baf266ef6cb5140f03498d58c SHA512 bd2bb026f89d1ce5b6c97de36bb38e3ca2a6c83811160b901b2a1e6d6c4d0515bb3e9aa90bd629004e441fb25166a5690ab9f3a3168f6c3f1bc0120faf6d57dd WHIRLPOOL 96b49b7f291775c065bd2951173508914b20387bccded32aa62244a4266e6e3e8b8ae15e35efe0e65b7fdd85106e0372aba9f567aa4ec0c708b73f18175b145c -AUX 93_export_remote_keyboard_config.dpatch 3161 SHA256 bb46ac2d0f54cc5047e1f3d81abff27ab20c5475b4a7c6acd65b416187c485d1 SHA512 a404ee3273ca62dfc2a47f721a76657569b577e1007f5d16f260a8486520e069a58b7556b519f4993b44dc66e7b80fee677d702939e2660f6ace9514d5b49ddc WHIRLPOOL 0bd6a605ed7aa6f2780115d0ccaf0c22fa5f6842ffde2278d703e1de4218a3caf6ad65cf3cda6971073d47d44decd4332cff6e6348fd20506b466fb3fb58f993 -AUX 95_fix_Imakefile.dpatch 1844 SHA256 bd2f28fdf0026fc02aca04403592b48b18b73acd7b40374af057c03600fb5022 SHA512 7e6b351dd38769efcd64fefe000a3a8aa05050dce7ae58f6967d8d0454baf20c87eb5f81ba287d0d50a6743b2bd004d13773295191a41f4103cb715b3cdbd7e7 WHIRLPOOL d5358bb5c7d132a887afc6909483e5d66633ec087d3563be537bcd7e77d4be238a9366c0675290b48721844a7451edc4fccc6eb127941ae5f2515805b136952e -AUX createpixmap_bounds_check.patch 1205 SHA256 afc37d4828a6bcd100ae706189962db1239e74061f4576edd0c017df73e72f71 SHA512 f732f6619830f47c4ca5ed0678a0348dbb03903329ca94cb9ac666f116ac1b998ae87e31c570636e3f6041347ecbb3e6a12893a51e61b8b785ebbb451a0552b4 WHIRLPOOL 0f02de1d33c9780cdc9f9f4d3e9585a324dda261dcbb440b55f72773ecfae24b3a8a5b6536fa86307ff9e72086c742a9bddb8b985837a923064ea23f6b153555 -AUX nx-X11-3.4.0-Imake-fix-1.patch 1313 SHA256 91a3e675e200e1e2245e8ad4636e089dacc1302c7e309d929dc5021db160a48f SHA512 ac56a87feb80059646dd0cd83ac1e649232ccc4481bf66ed09e74c76d60cf6434d13bd4aca168bde170de700632f3b876e12c5ad2a3ef50396d02be01d1608fe WHIRLPOOL eacdc45d2672fa6e8843141d7d855631c7257212a89d07aac164f807501dce1a97715be708675c2fbdacd9116367364298595a80dedb8b7f42b9e9137aa5a30d -AUX nx-X11-dimbor.patch 1942 SHA256 73fb482e21592103d39380788fe4d7fa1e04389b9178026bcd4d264db363c27b SHA512 822fa3975b5f002e89e3876a19f0c4a6e319dd21b91d9156327ca2f865746d3380758c22278b41719a003b7448635586d6c115e7d2e4411ec575741d664013ae WHIRLPOOL 5666c65142dff5f7a6d8eea8daf98e1693fa223bf020f63795e0d24c1cda99b8e14497094afbedf24ea4e9cafd021b02f70f225b7e4dbb7c118dbd20688ff3b3 -AUX nx-X11-utf8_copy_clipboard.patch 1685 SHA256 8b51793e6209ba287a97b1206537110de9f4cde646994bdd6a9fde68b2acaeb6 SHA512 452e03711e7fe3849b53c900af63d177b10c4e0e490114bd3c3eda3ebdd4654e02ab07b909fca908b34d76d0a7719f57fbcf8dfcba79c2adfbe73de7d737ef1f WHIRLPOOL e20749083e78ac11f8ab356b0c1b3d37059dd77935f6edc0a98b49350b021cadfd5a48006fb901885d14ee6af3a1bcebe853bd57658145322a1aacf89a326317 -AUX nx-x11-1.5.0-tmp-exec.patch 349 SHA256 bbaeeb4e04c04da96f37dfb7ab5e494094d61a390ef2ae24813a5f49b3c44971 SHA512 6be72c507165c7a656acd2cd7b10c8aa1ad179cf3351eec9c7ced497142639adcb22f05a921d891365e92f9fade23bdb46bf104320a83506c7f692e34b7a0512 WHIRLPOOL 7130f1948f91be934d7b157856ba81c8850e528ceaa646037b0f3d152e925d63c8d34a3fa1a7f864310dd7407786e709ebffd090b3c951068482391f75326bd4 -AUX nxa_wine_close_delay.patch 1446 SHA256 ad7f18882c3973d83cd2751a49d99f3a27e726960cb250c206ff8de9da80acbb SHA512 6e9d2054b2320a7526cb26e930245daab6c55190fc3a053473a045f16bce9cc8f7cc762dd66205a48bf9623b0a631ac1e1c39078154f7cdb27dd160093ba74e3 WHIRLPOOL ec71a2aedeee38a818a2286b8e3418c34ed25805d1ec6434a4fd8905aa7cdebb830b40e1736ad632727d50933eded0fbf5f08b019fd5a004bfe5b27d68bebd85 -AUX nxagent.1 662 SHA256 9a3a6ba81c444ef008db42168065d3ed6062bed1d55b3186b6b465a9da27f7d4 SHA512 2673ab1753195a55bd5430c3f3eb984f43b48d2acf98fe423d0e11a83a8c2e6b3a095817a9b790505262c411d9e1f275cbfbe3fc929226f1f274253d65db8720 WHIRLPOOL 3713f9fc121d757f4888e390e50e419cdff5a7424009483ddde05a3d9da75bcf738ec1fa307bdee497e803cd4fc1bff4b9c8c7301f3c543dd044f7886507c0f0 -AUX nxagent.MotifWMHints_Utf8Names.dimbor.patch 3384 SHA256 0ebf1f6fe4a45791e8f05ba2dbe89fc525f653341e8ab76d182dd16616898e49 SHA512 d59839b57bb6e541468b49f6d8518a5cddc0f3941cdbd762e7a2cf474d7f9f02a10e2c9758a6bb743b39cc586a8b7f97e8a3c8e7a988b85bbd25d19b72c28ca1 WHIRLPOOL 684e410d29222901aec3649493fcefa38b616e15095eb0e4bca68d6f060aaff9ddf9d813025002933670d509f54740d4cb4c04fdaaf4e9d57ecd9a624425c221 -AUX nxagent.keyboard 14 SHA256 de210be92e7e41921b67d6509caf61b3c931b78b4ff72bde152791a1c55aee45 SHA512 8c246c634b561e2381e26d9ffe9034abbb4a72fc7b02dec15ca7aac024cb7126614dd845db35618a4c28c39dfb899cb728bf911cdbcca4da09edeb9bd37995be WHIRLPOOL 0c01a23ff20d3a0af1232adb72fbc72578936affbd47992278db6f6ac30bc92859b0774f24b0af923fa5a167bd2a56ad7719bf53473d92df12e65a72114478da -AUX rgb 17394 SHA256 2c8ab5acc9eb072f4cc88696834188100d05e50af5d1425501d993700aaa3164 SHA512 a5ab9660410d0f080e216df828b2a5f76cf32f90adcb157ab74609bad6268cdd97e6c2408e512126170028f52913d82e59a7df71a53e36c94bd6517ba50158f3 WHIRLPOOL 94dd47b96c4750ddc4e5f1c5d331dfee01ed2ad53f741d4c3905c4d5d9c9fcd250799824ed237f40e8650efa0c8040734d30b57b2ae4323dc849426ac551631a -AUX unbranded.diff 1854 SHA256 cea9536e13fd7e6ae095feca394613db1d32bbc3c9fa0fca7afa6fc88f438d67 SHA512 88e9abf59087a8ff4582e110c6702fbaf9ef6ae672ea16e156969b071529faafb6b4e6992a198af030721557d95a294a96fa56dbb0b2c3c6d9502262f19bf95c WHIRLPOOL 72d66e3522359b9a36ce1d37bfc90958806aab4d96baa20e8237e5ae18ce617ac4d18bb8860adca00b69b78ba57c8ce2e105ad2b5dfd93e3b43054a153b30339 -DIST nx-X11-3.4.0-4.tar.gz 20244510 SHA256 c8654b5a5d607ace755a3a44831335af9f65a45bcb6501d92d94e81af338b1da -DIST nxagent-3.4.0-11.tar.gz 1558371 SHA256 0fc1a4b0888a51047d9771031668ab1e8d7a02aa0d733597e8a820098b924026 -DIST nxauth-3.4.0-3.tar.gz 30637 SHA256 6ac8238852b1b3754ed1ed917ede5cd7473c482c0d847f2fb2c8c9a1334e3516 -EBUILD nx-X11-3.4.0_p4.ebuild 3725 SHA256 9fe8774009934682227efa7765d2913062dabf077a09c40b4778f8060b76fe24 SHA512 1e68ceea18fe976f4238bd90d33c760e19fbd104c8e4c0f805c9e50591693cbd324bd0f14089ca388cd70c72a15197044aa69eef30d494e8ef9b8ac4ff01ed64 WHIRLPOOL d18828e4a8b697a8239d4d0b44b81be30847d0550edc29c938d9a2e23c698fd141c50e455234fddeaefc4963727c1874616a2af02797bf493ead2724ba796af4 -MISC ChangeLog 1174 SHA256 18e8ebd5ad6c2c4bece543201e3ce3e61abadc08f92ba9db892218cbd997208b SHA512 ec76b4b2021b3d555ef8633ebdce3faefa6671a8d6af527c2f0c2d0297cb1929fbdca213d11cd25842a38dd29ed104a993685f003e15080a3d3374b32385595c WHIRLPOOL 6a87a1ad7a12ab2a6860aad094ac53c06330e2c5616625bb9411bd82a3dc132bd8b87cc3d85663c680c7c98894eaca986b4973363cdc0e3a5f181ad3199153d3 -MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9 diff --git a/net-misc/nx-X11/files/01_build_nx-X11_without_nxcomp.dpatch b/net-misc/nx-X11/files/01_build_nx-X11_without_nxcomp.dpatch deleted file mode 100644 index 83467255..00000000 --- a/net-misc/nx-X11/files/01_build_nx-X11_without_nxcomp.dpatch +++ /dev/null @@ -1,52 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_build_nx-X11_without_nxcomp.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Correct build without nxcomp and nxcompext - -@DPATCH@ ---- a/lib/X11/Imakefile -+++ b/lib/X11/Imakefile -@@ -1150,30 +1150,30 @@ - #if NXLibraries - - $(NX_XCOMPCONFIGTARGET): -- cd ../../../nxcomp && \ -- ./configure -+# cd ../../../nxcomp && \ -+# ./configure - - $(NX_XCOMPEXTCONFIGTARGET): -- cd ../../../nxcompext && \ -- ./configure -+# cd ../../../nxcompext && \ -+# ./configure - - #ifdef SunArchitecture - $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) -- cd $(NX_XCOMPLIBDIR) && \ -- gmake -+# cd $(NX_XCOMPLIBDIR) && \ -+# gmake - - $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) -- cd ../../../nxcompext && \ -- gmake -+# cd ../../../nxcompext && \ -+# gmake - - #else - $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) -- cd $(NX_XCOMPLIBDIR) && \ -- make -+# cd $(NX_XCOMPLIBDIR) && \ -+# make - - $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) -- cd ../../../nxcompext && \ -- make -+# cd ../../../nxcompext && \ -+# make - - #endif - diff --git a/net-misc/nx-X11/files/02_dont_build_nxcompshad.dpatch b/net-misc/nx-X11/files/02_dont_build_nxcompshad.dpatch deleted file mode 100644 index d961d14a..00000000 --- a/net-misc/nx-X11/files/02_dont_build_nxcompshad.dpatch +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_dont_build_nxcompshad.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Correct build without nxcompext - -@DPATCH@ ---- a/programs/Xserver/Imakefile -+++ b/programs/Xserver/Imakefile -@@ -1037,17 +1037,17 @@ - NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status - - $(NX_XSHADOWCONFIGTARGET): -- cd $(NX_XSHADOWLIBDIR) && \ -- ./configure -+# cd $(NX_XSHADOWLIBDIR) && \ -+# ./configure - - #ifdef SunArchitecture - $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) -- cd $(NX_XSHADOWLIBDIR) && \ -- gmake -+# cd $(NX_XSHADOWLIBDIR) && \ -+# gmake - #else - $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) -- cd $(NX_XSHADOWLIBDIR) && \ -- make -+# cd $(NX_XSHADOWLIBDIR) && \ -+# make - #endif - - ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \ diff --git a/net-misc/nx-X11/files/85_nx-X11_debian-ld.dpatch b/net-misc/nx-X11/files/85_nx-X11_debian-ld.dpatch deleted file mode 100644 index 9efb3a90..00000000 --- a/net-misc/nx-X11/files/85_nx-X11_debian-ld.dpatch +++ /dev/null @@ -1,130 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 85_nx-X11_debian-ld.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change the library filename to not conflict with Xorg ones. - -@DPATCH@ ---- a/config/cf/X11.tmpl -+++ b/config/cf/X11.tmpl -@@ -2665,9 +2665,9 @@ - #ifndef SharedXrenderRev - #define SharedXrenderRev 1.2.2 - #endif --SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) -+SharedLibReferences(XRENDER,Xrender-nx,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) - #else --ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XRENDER,Xrender-nx,$(XRENDERLIBSRC),XBuildLibDir) - #endif - - XRANDRLIBSRC = $(LIBSRC)/Xrandr ---- a/lib/X11/Imakefile -+++ b/lib/X11/Imakefile -@@ -83,7 +83,7 @@ - #define DoExtraLib SharedLibX11 - #define DoDebugLib DebugLibX11 - #define DoProfileLib ProfileLibX11 --#define LibName X11 -+#define LibName X11-nx - #define SoRev SOXLIBREV - #define HugeLibrary YES - #define IncSubdir X11 ---- a/lib/Xext/Imakefile -+++ b/lib/Xext/Imakefile -@@ -10,14 +10,15 @@ - #define DoExtraLib SharedLibXext - #define DoDebugLib DebugLibXext - #define DoProfileLib ProfileLibXext --#define LibName Xext -+#define LibName Xext-nx - #define SoRev SOXEXTREV - #define LibHeaders NO - - #include - - #ifdef SharedXextReqs --REQUIREDLIBS = SharedXextReqs -+/* REQUIREDLIBS = SharedXextReqs $(NX_REQUIREDLIBS) */ -+REQUIREDLIBS = -L../../exports/lib/ -lX11-nx $(NX_REQUIREDLIBS) - #endif - - #if HasShm ---- a/lib/Xft/Imakefile -+++ b/lib/Xft/Imakefile -@@ -94,8 +94,7 @@ - FONTCONFIG_CFLAGS="$(FONTCONFIG_CFLAGS)" \ - FONTCONFIG_LIBS="$(FONTCONFIG_LIBS)" - --REQUIREDLIBS=$(LDPRELIBS) $(XRENDERLIB) $(XLIB) $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2LIB) -- -+REQUIREDLIBS=$(LDPRELIBS) -L../../exports/lib/ -lXrender-nx -lX11-nx $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2LIB) - HEADERS = Xft.h XftCompat.h - - SRCS = xftcolor.c xftdbg.c xftdpy.c \ ---- a/lib/Xft1/Imakefile -+++ b/lib/Xft1/Imakefile -@@ -92,7 +92,7 @@ - FREETYPE2REQLIB = $(FREETYPE2LIB) - #endif - --REQUIREDLIBS=$(LDPRELIBS) $(XRENDERLIB) $(XLIB) $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2REQLIB) -+REQUIREDLIBS=$(LDPRELIBS) -L../../exports/lib/ -lXrender-nx -lX11-nx $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2REQLIB) - - #if UseFreetype2 - FT_OLD = xftcache.c ---- a/lib/Xrender/Imakefile -+++ b/lib/Xrender/Imakefile -@@ -74,7 +74,7 @@ - #define DoSharedLib SharedLibXrender - #define DoDebugLib DebugLibXrender - #define DoProfileLib ProfileLibXrender --#define LibName Xrender -+#define LibName Xrender-nx - #define SoRev SOXRENDERREV - - #ifdef XBuildIncDir -@@ -89,7 +89,8 @@ - #include - - #ifdef SharedXrenderReqs --REQUIREDLIBS = SharedXrenderReqs -+/* REQUIREDLIBS = SharedXrenderReqs */ -+REQUIREDLIBS = $(LDPRELIB) -L../../exports/lib/ -lXext-nx -lX11-nx - #endif - - #if Malloc0ReturnsNull ---- a/programs/Xserver/Imakefile -+++ b/programs/Xserver/Imakefile -@@ -997,7 +997,7 @@ - XPMLIB = -lXpm - NXAGENT = hw/nxagent/LibraryTargetName(nxagent) - NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI) --NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) -+NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) -lX11-nx -lXext-nx -lXrender-nx $(SYSLIBS) $(XPMLIB) - #if HasParallelMake - MakeMutex($(NXAGENTDIRS) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS)) - #endif -@@ -1016,11 +1016,11 @@ - -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite - #elif defined(cygwinArchitecture) - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ -- -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ -+ -lXcomp -lXcompext -lX11-nx -lXext-nx -lXrender-nx -lXcomposite -lXfixes \ - -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst - #else - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -- -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -+ -lXcomp -lXcompext -lXcompshad -lX11-nx -lXext-nx -lXrender-nx -lXfixes \ - -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite - #endif - -@@ -1073,7 +1073,7 @@ - else exit 0; fi - $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \ - $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \ -- $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lXext -lX11 $(EXTRA_LOAD_FLAGS) -+ $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lX11-nx -lXext-nx $(EXTRA_LOAD_FLAGS) - #endif /* NXAgentServer */ - - #if defined(XnonServer) && XnonServer diff --git a/net-misc/nx-X11/files/86_set_rgb_path.dpatch b/net-misc/nx-X11/files/86_set_rgb_path.dpatch deleted file mode 100644 index 093c08a7..00000000 --- a/net-misc/nx-X11/files/86_set_rgb_path.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change the path to the keyboard configuration file - -@DPATCH@ ---- a/programs/Xserver/os/oscolor.c -+++ b/programs/Xserver/os/oscolor.c -@@ -53,7 +53,7 @@ - #include - #include - --static char* nxAltRgbPaths[] = {"/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; -+static char* nxAltRgbPaths[] = {"/usr/share/nxagent/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; - static char _NXRgbPath[1024]; - - #endif diff --git a/net-misc/nx-X11/files/87_set_securitypolicy_path.dpatch b/net-misc/nx-X11/files/87_set_securitypolicy_path.dpatch deleted file mode 100644 index de321f7d..00000000 --- a/net-misc/nx-X11/files/87_set_securitypolicy_path.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change the path to the keyboard configuration file - -@DPATCH@ ---- a/programs/Xserver/Xext/security.c -+++ b/programs/Xserver/Xext/security.c -@@ -86,7 +86,7 @@ - - #ifdef NXAGENT_SERVER - --#define NX_ALTERNATIVEPOLICYFILE "/usr/lib/xserver/SecurityPolicy" -+#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nxagent/SecurityPolicy" - - #endif - diff --git a/net-misc/nx-X11/files/90_set_X0-config_path.dpatch b/net-misc/nx-X11/files/90_set_X0-config_path.dpatch deleted file mode 100644 index 326c91b5..00000000 --- a/net-misc/nx-X11/files/90_set_X0-config_path.dpatch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/nxagent/programs/Xserver/hw/nxagent/Keyboard.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Keyboard.c -@@ -136,7 +136,7 @@ - #define XKB_ALTERNATE_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb" - #endif - #ifndef XKB_CONFIG_FILE --#define XKB_CONFIG_FILE "X0-config.keyboard" -+#define XKB_CONFIG_FILE "/etc/nxagent/nxagent.keyboard" - #endif - #ifndef XKB_DFLT_RULES_FILE - #define XKB_DFLT_RULES_FILE "xfree86" -@@ -978,8 +978,7 @@ - - XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb); - -- nxagentXkbConfigFilePathSize = strlen(XkbBaseDirectory) + -- strlen(XKB_CONFIG_FILE) + 1; -+ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE); - - nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char)); - -@@ -988,9 +987,7 @@ - FatalError("nxagentKeyboardProc: malloc failed."); - } - -- strcpy(nxagentXkbConfigFilePath, XkbBaseDirectory); -- strcat(nxagentXkbConfigFilePath, "/"); -- strcat(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); -+ strcpy(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); - - #ifdef TEST - fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n", diff --git a/net-misc/nx-X11/files/91_enable_debug.dpatch b/net-misc/nx-X11/files/91_enable_debug.dpatch deleted file mode 100755 index cf63e9c1..00000000 --- a/net-misc/nx-X11/files/91_enable_debug.dpatch +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 90_enable_debug.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad nx-3.3.0-3-6~/nx-X11/programs/Xserver/hw/nxagent/Imakefile nx-3.3.0-3-6/nx-X11/programs/Xserver/hw/nxagent/Imakefile ---- nx-3.3.0-3-6~/nx-X11/programs/Xserver/hw/nxagent/Imakefile 2008-11-05 12:47:49.000000000 -0200 -+++ nx-3.3.0-3-6/nx-X11/programs/Xserver/hw/nxagent/Imakefile 2008-11-21 11:04:10.000000000 -0200 -@@ -205,7 +205,8 @@ - -DNXAGENT_ONSTART \ - -DNXAGENT_SPLASH \ - -DNXAGENT_ARTSD \ -- -UNX_DEBUG_INPUT \ -+ -DNX_DEBUG_INPUT \ -+ -DDEBUG \ - -UPANORAMIX - - all:: $(OBJS) diff --git a/net-misc/nx-X11/files/93_export_remote_keyboard_config.dpatch b/net-misc/nx-X11/files/93_export_remote_keyboard_config.dpatch deleted file mode 100644 index ba2ed790..00000000 --- a/net-misc/nx-X11/files/93_export_remote_keyboard_config.dpatch +++ /dev/null @@ -1,86 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 93_export_remote_keyboar_config.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Export the client keyboard configurations to a file - -@DPATCH@ -Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Error.c -=================================================================== ---- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Error.c 2010-03-18 17:43:36.783686923 -0300 -+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Error.c 2010-03-18 17:46:09.832447167 -0300 -@@ -497,7 +497,7 @@ - return rootPath; - } - --char *nxagentGetSessionPath() -+char *nxagentGetSessionPath(void) - { - - char *rootPath; -Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Error.h -=================================================================== ---- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Error.h 2010-03-18 17:43:36.813686477 -0300 -+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Error.h 2010-03-18 17:46:09.832447167 -0300 -@@ -34,4 +34,6 @@ - - void nxagentEndRedirectToClientsLog(void); - -+char *nxagentGetSessionPath(void); -+ - #endif /* __Error_H__ */ -Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Keyboard.c -=================================================================== ---- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Keyboard.c 2010-03-18 17:46:09.153703849 -0300 -+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Keyboard.c 2010-03-18 17:46:09.832447167 -0300 -@@ -52,6 +52,7 @@ - #include "Keyboard.h" - #include "Events.h" - #include "Options.h" -+#include "Error.h" - - #include "NXlib.h" - -@@ -1770,6 +1771,42 @@ - } - #endif - -+ if (drulesLen != 0) -+ { -+ char *sessionpath = nxagentGetSessionPath(); -+ if (sessionpath != NULL){ -+ int keyboard_file_path_size = strlen(sessionpath) + strlen("/keyboard"); -+ char *keyboard_file_path = malloc((keyboard_file_path_size + 1) * sizeof(char)); -+ FILE *keyboard_file; -+ if ( keyboard_file_path == NULL) -+ { -+ FatalError("nxagentKeyboardProc: malloc failed."); -+ } -+ strcpy(keyboard_file_path, sessionpath); -+ strcat(keyboard_file_path, "/keyboard"); -+ if ((keyboard_file = fopen(keyboard_file_path, "w")) != NULL) { -+ if ( drules != NULL ) -+ fprintf(keyboard_file, "rules=%s\n", drules); -+ if ( dmodel != NULL ) -+ fprintf(keyboard_file, "model=%s\n", dmodel); -+ if ( dlayout != NULL ) -+ fprintf(keyboard_file, "layout=%s\n", dlayout); -+ if ( dvariant != NULL ) -+ fprintf(keyboard_file, "variant=%s\n", dvariant); -+ if ( doptions != NULL ) -+ fprintf(keyboard_file, "options=%s\n", doptions); -+ fclose(keyboard_file); -+ } -+ free(keyboard_file_path); -+ fprintf(stderr, "keyboard file created\n"); -+ } -+ fprintf(stderr, "SessionPath not defined\n"); -+ } -+ else -+ { -+ fprintf(stderr, "Failed to create the keyboard file\n"); -+ } -+ - if (nxagentOption(ClientOs) == ClientOsLinux && - drules != NULL && dmodel != NULL && - (strcmp(drules, "evdev") == 0 || diff --git a/net-misc/nx-X11/files/95_fix_Imakefile.dpatch b/net-misc/nx-X11/files/95_fix_Imakefile.dpatch deleted file mode 100644 index 33dac0cf..00000000 --- a/net-misc/nx-X11/files/95_fix_Imakefile.dpatch +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 95_fix_Imakefile.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Imakefile -=================================================================== ---- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Imakefile 2010-03-18 17:43:36.743684770 -0300 -+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Imakefile 2010-03-18 17:46:10.473686346 -0300 -@@ -137,7 +137,7 @@ - NXFONTINCLUDES = -I../../../../lib/font/include - LIBXRANDRINCLUDES= -I../../../../lib/Xrandr - --INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ -+INCLUDES = -I. -I/usr/include -I/usr/include/nx \ - -I../../../../extras/Mesa/include \ - -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ - -I../../mi -I../../include -I../../os \ -@@ -146,7 +146,7 @@ - -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) - #ifdef SunArchitecture --INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ -+INCLUDES = -I. -I/usr/include -I/usr/include/nx \ - -I../../../../extras/Mesa/include \ - -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ - -I/usr/sfw/include \ -@@ -161,7 +161,7 @@ - -I../../mi -I../../include -I../../os \ - -I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ - -I../../miext/damage -I../../miext/cw \ -- -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ -+ -I/usr/include -I/usr/include/nx \ - -I../../../../extras/Mesa/include \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) diff --git a/net-misc/nx-X11/files/createpixmap_bounds_check.patch b/net-misc/nx-X11/files/createpixmap_bounds_check.patch deleted file mode 100644 index 1567cf70..00000000 --- a/net-misc/nx-X11/files/createpixmap_bounds_check.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/NXdispatch.c -=================================================================== ---- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/NXdispatch.c 2007-06-02 18:49:57.000000000 -0300 -+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/NXdispatch.c 2010-03-18 17:51:32.963686193 -0300 -@@ -1973,6 +1973,23 @@ - client->errorValue = 0; - return BadValue; - } -+ if (stuff->width > 32767 || stuff->height > 32767) -+ { -+ /* It is allowed to try and allocate a pixmap which is larger than -+ * 32767 in either dimension. However, all of the framebuffer code -+ * is buggy and does not reliably draw to such big pixmaps, basically -+ * because the Region data structure operates with signed shorts -+ * for the rectangles in it. -+ * -+ * Furthermore, several places in the X server computes the -+ * size in bytes of the pixmap and tries to store it in an -+ * integer. This integer can overflow and cause the allocated size -+ * to be much smaller. -+ * -+ * So, such big pixmaps are rejected here with a BadAlloc -+ */ -+ return BadAlloc; -+ } - if (stuff->depth != 1) - { - pDepth = pDraw->pScreen->allowedDepths; diff --git a/net-misc/nx-X11/files/nx-X11-3.4.0-Imake-fix-1.patch b/net-misc/nx-X11/files/nx-X11-3.4.0-Imake-fix-1.patch deleted file mode 100644 index a1ce753a..00000000 --- a/net-misc/nx-X11/files/nx-X11-3.4.0-Imake-fix-1.patch +++ /dev/null @@ -1,34 +0,0 @@ -Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com) -Date: 2010-06-14 -Initial Package Version: 3.4.0 -Origin: me -Upstream Status: unknown -Description: fix location of header files - -diff -Naur nx-X11.orig/lib/X11/Imakefile nx-X11/lib/X11/Imakefile ---- nx-X11.orig/lib/X11/Imakefile 2010-06-14 21:00:25.766704602 +0000 -+++ nx-X11/lib/X11/Imakefile 2010-06-14 21:00:57.692957389 +0000 -@@ -37,9 +37,9 @@ - #if NXLibraries - - #ifdef SunArchitecture --NX_INCLUDES = -I../../../nxcomp -I/usr/sfw/include -+NX_INCLUDES = -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/sfw/include - #else --NX_INCLUDES = -I../../../nxcomp -+NX_INCLUDES = -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1 - #endif - - NX_DEFINES = -DNX_TRANS_SOCKET \ -diff -Naur nx-X11.orig/programs/Xserver/os/Imakefile nx-X11/programs/Xserver/os/Imakefile ---- nx-X11.orig/programs/Xserver/os/Imakefile 2010-06-14 21:00:26.230954814 +0000 -+++ nx-X11/programs/Xserver/os/Imakefile 2010-06-14 21:01:37.215706106 +0000 -@@ -30,7 +30,7 @@ - - #if NXLibraries - --NX_INCLUDES = -I../../../../nxcomp -+NX_INCLUDES = -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1 - - NX_DEFINES = -DNX_TRANS_SOCKET \ - -DNX_TRANS_AUTH \ diff --git a/net-misc/nx-X11/files/nx-X11-dimbor.patch b/net-misc/nx-X11/files/nx-X11-dimbor.patch deleted file mode 100644 index e35f54ae..00000000 --- a/net-misc/nx-X11/files/nx-X11-dimbor.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Clipboard.c -=================================================================== ---- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Clipboard.c 2010-03-18 17:51:26.552437837 -0300 -+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Clipboard.c 2010-03-18 17:51:28.412436733 -0300 -@@ -1226,10 +1226,11 @@ - Atom xa_STRING[4]; - xEvent x; - -+ /* --- Order changed by dimbor (prevent sending COMPOUND_TEXT to client --- */ - xa_STRING[0] = XA_STRING; -- xa_STRING[1] = clientTEXT; -- xa_STRING[2] = clientCOMPOUND_TEXT; -- xa_STRING[3] = clientUTF8_STRING; -+ xa_STRING[1] = clientUTF8_STRING; -+ xa_STRING[2] = clientTEXT; -+ xa_STRING[3] = clientCOMPOUND_TEXT; - - ChangeWindowProperty(pWin, - property, -Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Image.c -=================================================================== ---- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Image.c 2008-06-09 08:08:16.000000000 -0300 -+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Image.c 2010-03-18 17:51:28.412436733 -0300 -@@ -644,6 +644,10 @@ - pDrawable -> depth != 1 && - nxagentOption(DeferLevel) >= 1) - { -+ /* -- changed by dimbor (small "bed-sheets" never need be prevented - always put) --*/ -+ if (dstHeight > 16) -+ { -+ /* -------------------------------------------------------------------------------- */ - #ifdef TEST - fprintf(stderr, "nxagentPutImage: WARNING! Prevented operation on region [%d,%d,%d,%d] " - "for drawable at [%p] with drawable pixmap.\n", pRegion -> extents.x1, -@@ -654,6 +658,9 @@ - nxagentMarkCorruptedRegion(pDrawable, pRegion); - - goto nxagentPutImageEnd; -+ /* --- changed by dimbor ---*/ -+ } -+ /* ------------------------- */ - } - - if (pDrawable -> type == DRAWABLE_WINDOW && diff --git a/net-misc/nx-X11/files/nx-X11-utf8_copy_clipboard.patch b/net-misc/nx-X11/files/nx-X11-utf8_copy_clipboard.patch deleted file mode 100644 index 922a8fd2..00000000 --- a/net-misc/nx-X11/files/nx-X11-utf8_copy_clipboard.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Clipboard.c -=================================================================== ---- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Clipboard.c 2010-03-18 17:48:50.052435459 -0300 -+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Clipboard.c 2010-03-18 17:52:04.012445465 -0300 -@@ -166,7 +166,9 @@ - - if (target == XA_STRING) return True; - if (target == serverTEXT) return True; -- -+ /* by dimbor */ -+ if (target == serverUTF8_STRING) return True; -+ - return False; - } - -@@ -402,7 +404,12 @@ - lastServerProperty = X->xselectionrequest.property; - lastServerRequestor = X->xselectionrequest.requestor; - lastServerTarget = X->xselectionrequest.target; -- lastServerTime = X->xselectionrequest.time; -+ -+ /* by dimbor */ -+ if (lastServerTarget != XA_STRING) -+ lastServerTarget = serverUTF8_STRING; -+ -+ lastServerTime = X->xselectionrequest.time; - - x.u.u.type = SelectionRequest; - x.u.selectionRequest.time = GetTimeInMillis(); -@@ -424,11 +431,12 @@ - - x.u.selectionRequest.selection = CurrentSelections[i].selection; - -- /* -- * x.u.selectionRequest.target = X->xselectionrequest.target; -- */ -- -- x.u.selectionRequest.target = XA_STRING; -+ /* by dimbor (idea from zahvatov) */ -+ if (X->xselectionrequest.target != XA_STRING) -+ x.u.selectionRequest.target = clientUTF8_STRING; -+ else -+ x.u.selectionRequest.target = XA_STRING; -+ - x.u.selectionRequest.property = clientCutProperty; - - (void) TryClientEvents(lastSelectionOwner[i].client, &x, 1, diff --git a/net-misc/nx-X11/files/nx-x11-1.5.0-tmp-exec.patch b/net-misc/nx-X11/files/nx-x11-1.5.0-tmp-exec.patch deleted file mode 100644 index ece22145..00000000 --- a/net-misc/nx-X11/files/nx-x11-1.5.0-tmp-exec.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nx-X11/config/imake/imake.c.orig 2006-11-05 00:10:49.000000000 +0000 -+++ nx-X11/config/imake/imake.c 2006-11-05 00:11:49.000000000 +0000 -@@ -974,7 +974,7 @@ - static void - get_libc_version(FILE *inFile) - { -- char aout[] = "/tmp/imakeXXXXXX"; -+ char aout[] = "./imakeXXXXXX"; - FILE *fp; - const char *format = "%s -o %s -x c -"; - char *cc; diff --git a/net-misc/nx-X11/files/nxa_wine_close_delay.patch b/net-misc/nx-X11/files/nxa_wine_close_delay.patch deleted file mode 100644 index 4ea4cd69..00000000 --- a/net-misc/nx-X11/files/nxa_wine_close_delay.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/nxagent/programs/Xserver/hw/nxagent/Window.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Window.c -@@ -176,6 +176,14 @@ - - static int nxagentForceExposure(WindowPtr pWin, pointer ptr); - -+/* by dimbor */ -+typedef struct -+{ -+ CARD32 state; -+ Window icon; -+} -+nxagentWMStateRec; -+ - /* - * This is currently unused. - */ -@@ -1640,6 +1648,17 @@ - nxagentAddConfiguredWindow(pWin, CWStackingOrder); - nxagentAddConfiguredWindow(pWin, CW_Shape); - -+ /* add by dimbor */ -+ if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin)) -+ { -+ Atom prop = MakeAtom("WM_STATE", strlen("WM_STATE"), True); -+ nxagentWMStateRec wmState; -+ wmState.state = 1; /* NormalState */ -+ wmState.icon = None; -+ if (ChangeWindowProperty(pWin, prop, prop, 32, 0, 2, &wmState, 1) != Success) -+ fprintf(stderr, "nxagentRealizeWindow: Additing WM_STATE fail.\n"); -+ } -+ - #ifdef SHAPE - - /* -@@ -1686,6 +1705,17 @@ - return True; - } - -+ /* add by dimbor */ -+ if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin)) -+ { -+ Atom prop = MakeAtom("WM_STATE", strlen("WM_STATE"), True); -+ nxagentWMStateRec wmState; -+ wmState.state = 3; /* WithdrawnState */ -+ wmState.icon = None; -+ if (ChangeWindowProperty(pWin, prop, prop, 32, 0, 2, &wmState, 1) != Success) -+ fprintf(stderr, "nxagentUnRealizeWindow: Changing WM_STATE failed.\n"); -+ } -+ - XUnmapWindow(nxagentDisplay, nxagentWindow(pWin)); - - return True; diff --git a/net-misc/nx-X11/files/nxagent.1 b/net-misc/nx-X11/files/nxagent.1 deleted file mode 100644 index cc3e2f6a..00000000 --- a/net-misc/nx-X11/files/nxagent.1 +++ /dev/null @@ -1,24 +0,0 @@ -.TH NXAGENT 1 -.SH NAME -nxagent \- A helper application for NoMachine NX. -.SH SYNOPSIS -.B nxagent -.I "[options]" -.SH DESCRIPTION -.B nxagent -nxagent is a X server for remote access. It implements a very efficient -compression of the X11 protocol. This increases performance when -using X applications over a network, providing a near local experience. -. -nxagent should not be used alone. Look for qtnx and FreeNX. -.SH OPTIONS -.TP -.B \--help -Lists all options - -.SH CONTACT -Informations can be found on http://freenx.berlios.de/. - -.SH AUTHOR -This manual page was written by Per Hansen , -and modified by Marcelo Boveto Shima diff --git a/net-misc/nx-X11/files/nxagent.MotifWMHints_Utf8Names.dimbor.patch b/net-misc/nx-X11/files/nxagent.MotifWMHints_Utf8Names.dimbor.patch deleted file mode 100644 index 82552fd3..00000000 --- a/net-misc/nx-X11/files/nxagent.MotifWMHints_Utf8Names.dimbor.patch +++ /dev/null @@ -1,122 +0,0 @@ -Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Init.c -=================================================================== ---- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Init.c 2010-02-02 13:25:57.000000000 -0200 -+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Init.c 2010-03-18 17:51:31.283686781 -0300 -@@ -64,6 +64,9 @@ - #include "NX.h" - #include "NXlib.h" - -+/* by dimbor */ -+#include -+ - /* - * Set here the required log level. - */ -@@ -339,6 +342,20 @@ - */ - - blackRoot = TRUE; -+ -+ /* by dimbor */ -+ char *locale = setlocale(LC_ALL, ""); -+ if (!locale) -+ fprintf(stderr, "InitOutput: failed to set locale, reverting to \"C\"\n"); -+ else -+ { -+ if (!XSupportsLocale()) -+ fprintf(stderr, "InitOutput: Locale %s not supported by X\n",locale); -+ else -+ fprintf(stderr, "InitOutput: Set %s locale\n",locale); -+ } -+ if (!XSetLocaleModifiers("")) -+ fprintf(stderr,"InitOutput: cannot set locale modifiers.\n"); - } - - void InitInput(argc, argv) -Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Rootless.c -=================================================================== ---- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Rootless.c 2009-08-20 10:02:39.000000000 -0300 -+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Rootless.c 2010-03-18 17:51:31.283686781 -0300 -@@ -32,6 +32,10 @@ - - #include "NXlib.h" - -+/* by dimbor */ -+#include "Xatom.h" -+#include -+ - /* - * Set here the required log level. - */ -@@ -100,6 +104,10 @@ - - static void nxagentRemovePropertyFromList(void); - -+/* by dimbor */ -+static char szAgentUTF8_STRING[] = "UTF8_STRING"; -+static Atom agentUTF8_STRING; -+ - /* - * This is currently unused. - */ -@@ -419,6 +427,28 @@ - } - } - -+/* by dimbor */ -+char *textToUTF8String(char *text, int nitems) -+{ -+ XTextProperty t_prop; -+ char *ret=NULL; -+ t_prop.value=((unsigned char *)text); -+ t_prop.nitems=nitems; -+ if (!t_prop.nitems) -+ return ret; -+ t_prop.format=8; -+ t_prop.encoding=XInternAtom(nxagentDisplay, "COMPOUND_TEXT", 0); -+ char **list; -+ int num; -+ int r = XmbTextPropertyToTextList(nxagentDisplay, &t_prop,&list, &num); -+ if ((r == Success || r > 0) && num > 0 && *list) -+ { -+ ret=(char *)strdup (*list); -+ XFreeStringList(list); -+ } -+ return ret; -+} -+ - int nxagentExportAllProperty(pWin) - WindowPtr pWin; - { -@@ -464,6 +494,7 @@ - - if (strncmp(propertyS, "WM_", 3) != 0 && - strncmp(propertyS, "_NET_", 5) != 0 && -+ strncmp(propertyS, "_MOTIF_", 7) != 0 && - strcmp(propertyS, "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR") != 0) - { - #ifdef TEST -@@ -474,6 +505,7 @@ - #endif - } - else if (strcmp(typeS, "STRING") == 0 || -+ strcmp(typeS, "_MOTIF_WM_HINTS") == 0 || - #ifndef _XSERVER64 - strcmp(typeS, "CARDINAL") == 0 || - strcmp(typeS, "WM_SIZE_HINTS") == 0 || -@@ -483,6 +515,15 @@ - output = value; - export = True; - } -+ /* add by dimbor */ -+ else if (strcmp(typeS, "COMPOUND_TEXT") == 0) -+ { -+ output = textToUTF8String(value, nUnits); -+ nUnits = strlen((char *) output); -+ type = MakeAtom(szAgentUTF8_STRING, strlen(szAgentUTF8_STRING), True); -+ freeMem = True; -+ export = True; -+ } - #ifdef _XSERVER64 - else if (strcmp(typeS, "CARDINAL") == 0 || strcmp(typeS, "WM_SIZE_HINTS") == 0) - { diff --git a/net-misc/nx-X11/files/nxagent.keyboard b/net-misc/nx-X11/files/nxagent.keyboard deleted file mode 100644 index afe28326..00000000 --- a/net-misc/nx-X11/files/nxagent.keyboard +++ /dev/null @@ -1 +0,0 @@ -rules=xfree86 diff --git a/net-misc/nx-X11/files/rgb b/net-misc/nx-X11/files/rgb deleted file mode 100644 index b9e56c60..00000000 --- a/net-misc/nx-X11/files/rgb +++ /dev/null @@ -1,754 +0,0 @@ -! $Xorg: rgb.txt,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ -255 250 250 snow -248 248 255 ghost white -248 248 255 GhostWhite -245 245 245 white smoke -245 245 245 WhiteSmoke -220 220 220 gainsboro -255 250 240 floral white -255 250 240 FloralWhite -253 245 230 old lace -253 245 230 OldLace -250 240 230 linen -250 235 215 antique white -250 235 215 AntiqueWhite -255 239 213 papaya whip -255 239 213 PapayaWhip -255 235 205 blanched almond -255 235 205 BlanchedAlmond -255 228 196 bisque -255 218 185 peach puff -255 218 185 PeachPuff -255 222 173 navajo white -255 222 173 NavajoWhite -255 228 181 moccasin -255 248 220 cornsilk -255 255 240 ivory -255 250 205 lemon chiffon -255 250 205 LemonChiffon -255 245 238 seashell -240 255 240 honeydew -245 255 250 mint cream -245 255 250 MintCream -240 255 255 azure -240 248 255 alice blue -240 248 255 AliceBlue -230 230 250 lavender -255 240 245 lavender blush -255 240 245 LavenderBlush -255 228 225 misty rose -255 228 225 MistyRose -255 255 255 white - 0 0 0 black - 47 79 79 dark slate gray - 47 79 79 DarkSlateGray - 47 79 79 dark slate grey - 47 79 79 DarkSlateGrey -105 105 105 dim gray -105 105 105 DimGray -105 105 105 dim grey -105 105 105 DimGrey -112 128 144 slate gray -112 128 144 SlateGray -112 128 144 slate grey -112 128 144 SlateGrey -119 136 153 light slate gray -119 136 153 LightSlateGray -119 136 153 light slate grey -119 136 153 LightSlateGrey -190 190 190 gray -190 190 190 grey -211 211 211 light grey -211 211 211 LightGrey -211 211 211 light gray -211 211 211 LightGray - 25 25 112 midnight blue - 25 25 112 MidnightBlue - 0 0 128 navy - 0 0 128 navy blue - 0 0 128 NavyBlue -100 149 237 cornflower blue -100 149 237 CornflowerBlue - 72 61 139 dark slate blue - 72 61 139 DarkSlateBlue -106 90 205 slate blue -106 90 205 SlateBlue -123 104 238 medium slate blue -123 104 238 MediumSlateBlue -132 112 255 light slate blue -132 112 255 LightSlateBlue - 0 0 205 medium blue - 0 0 205 MediumBlue - 65 105 225 royal blue - 65 105 225 RoyalBlue - 0 0 255 blue - 30 144 255 dodger blue - 30 144 255 DodgerBlue - 0 191 255 deep sky blue - 0 191 255 DeepSkyBlue -135 206 235 sky blue -135 206 235 SkyBlue -135 206 250 light sky blue -135 206 250 LightSkyBlue - 70 130 180 steel blue - 70 130 180 SteelBlue -176 196 222 light steel blue -176 196 222 LightSteelBlue -173 216 230 light blue -173 216 230 LightBlue -176 224 230 powder blue -176 224 230 PowderBlue -175 238 238 pale turquoise -175 238 238 PaleTurquoise - 0 206 209 dark turquoise - 0 206 209 DarkTurquoise - 72 209 204 medium turquoise - 72 209 204 MediumTurquoise - 64 224 208 turquoise - 0 255 255 cyan -224 255 255 light cyan -224 255 255 LightCyan - 95 158 160 cadet blue - 95 158 160 CadetBlue -102 205 170 medium aquamarine -102 205 170 MediumAquamarine -127 255 212 aquamarine - 0 100 0 dark green - 0 100 0 DarkGreen - 85 107 47 dark olive green - 85 107 47 DarkOliveGreen -143 188 143 dark sea green -143 188 143 DarkSeaGreen - 46 139 87 sea green - 46 139 87 SeaGreen - 60 179 113 medium sea green - 60 179 113 MediumSeaGreen - 32 178 170 light sea green - 32 178 170 LightSeaGreen -152 251 152 pale green -152 251 152 PaleGreen - 0 255 127 spring green - 0 255 127 SpringGreen -124 252 0 lawn green -124 252 0 LawnGreen - 0 255 0 green -127 255 0 chartreuse - 0 250 154 medium spring green - 0 250 154 MediumSpringGreen -173 255 47 green yellow -173 255 47 GreenYellow - 50 205 50 lime green - 50 205 50 LimeGreen -154 205 50 yellow green -154 205 50 YellowGreen - 34 139 34 forest green - 34 139 34 ForestGreen -107 142 35 olive drab -107 142 35 OliveDrab -189 183 107 dark khaki -189 183 107 DarkKhaki -240 230 140 khaki -238 232 170 pale goldenrod -238 232 170 PaleGoldenrod -250 250 210 light goldenrod yellow -250 250 210 LightGoldenrodYellow -255 255 224 light yellow -255 255 224 LightYellow -255 255 0 yellow -255 215 0 gold -238 221 130 light goldenrod -238 221 130 LightGoldenrod -218 165 32 goldenrod -184 134 11 dark goldenrod -184 134 11 DarkGoldenrod -188 143 143 rosy brown -188 143 143 RosyBrown -205 92 92 indian red -205 92 92 IndianRed -139 69 19 saddle brown -139 69 19 SaddleBrown -160 82 45 sienna -205 133 63 peru -222 184 135 burlywood -245 245 220 beige -245 222 179 wheat -244 164 96 sandy brown -244 164 96 SandyBrown -210 180 140 tan -210 105 30 chocolate -178 34 34 firebrick -165 42 42 brown -233 150 122 dark salmon -233 150 122 DarkSalmon -250 128 114 salmon -255 160 122 light salmon -255 160 122 LightSalmon -255 165 0 orange -255 140 0 dark orange -255 140 0 DarkOrange -255 127 80 coral -240 128 128 light coral -240 128 128 LightCoral -255 99 71 tomato -255 69 0 orange red -255 69 0 OrangeRed -255 0 0 red -255 105 180 hot pink -255 105 180 HotPink -255 20 147 deep pink -255 20 147 DeepPink -255 192 203 pink -255 182 193 light pink -255 182 193 LightPink -219 112 147 pale violet red -219 112 147 PaleVioletRed -176 48 96 maroon -199 21 133 medium violet red -199 21 133 MediumVioletRed -208 32 144 violet red -208 32 144 VioletRed -255 0 255 magenta -238 130 238 violet -221 160 221 plum -218 112 214 orchid -186 85 211 medium orchid -186 85 211 MediumOrchid -153 50 204 dark orchid -153 50 204 DarkOrchid -148 0 211 dark violet -148 0 211 DarkViolet -138 43 226 blue violet -138 43 226 BlueViolet -160 32 240 purple -147 112 219 medium purple -147 112 219 MediumPurple -216 191 216 thistle -255 250 250 snow1 -238 233 233 snow2 -205 201 201 snow3 -139 137 137 snow4 -255 245 238 seashell1 -238 229 222 seashell2 -205 197 191 seashell3 -139 134 130 seashell4 -255 239 219 AntiqueWhite1 -238 223 204 AntiqueWhite2 -205 192 176 AntiqueWhite3 -139 131 120 AntiqueWhite4 -255 228 196 bisque1 -238 213 183 bisque2 -205 183 158 bisque3 -139 125 107 bisque4 -255 218 185 PeachPuff1 -238 203 173 PeachPuff2 -205 175 149 PeachPuff3 -139 119 101 PeachPuff4 -255 222 173 NavajoWhite1 -238 207 161 NavajoWhite2 -205 179 139 NavajoWhite3 -139 121 94 NavajoWhite4 -255 250 205 LemonChiffon1 -238 233 191 LemonChiffon2 -205 201 165 LemonChiffon3 -139 137 112 LemonChiffon4 -255 248 220 cornsilk1 -238 232 205 cornsilk2 -205 200 177 cornsilk3 -139 136 120 cornsilk4 -255 255 240 ivory1 -238 238 224 ivory2 -205 205 193 ivory3 -139 139 131 ivory4 -240 255 240 honeydew1 -224 238 224 honeydew2 -193 205 193 honeydew3 -131 139 131 honeydew4 -255 240 245 LavenderBlush1 -238 224 229 LavenderBlush2 -205 193 197 LavenderBlush3 -139 131 134 LavenderBlush4 -255 228 225 MistyRose1 -238 213 210 MistyRose2 -205 183 181 MistyRose3 -139 125 123 MistyRose4 -240 255 255 azure1 -224 238 238 azure2 -193 205 205 azure3 -131 139 139 azure4 -131 111 255 SlateBlue1 -122 103 238 SlateBlue2 -105 89 205 SlateBlue3 - 71 60 139 SlateBlue4 - 72 118 255 RoyalBlue1 - 67 110 238 RoyalBlue2 - 58 95 205 RoyalBlue3 - 39 64 139 RoyalBlue4 - 0 0 255 blue1 - 0 0 238 blue2 - 0 0 205 blue3 - 0 0 139 blue4 - 30 144 255 DodgerBlue1 - 28 134 238 DodgerBlue2 - 24 116 205 DodgerBlue3 - 16 78 139 DodgerBlue4 - 99 184 255 SteelBlue1 - 92 172 238 SteelBlue2 - 79 148 205 SteelBlue3 - 54 100 139 SteelBlue4 - 0 191 255 DeepSkyBlue1 - 0 178 238 DeepSkyBlue2 - 0 154 205 DeepSkyBlue3 - 0 104 139 DeepSkyBlue4 -135 206 255 SkyBlue1 -126 192 238 SkyBlue2 -108 166 205 SkyBlue3 - 74 112 139 SkyBlue4 -176 226 255 LightSkyBlue1 -164 211 238 LightSkyBlue2 -141 182 205 LightSkyBlue3 - 96 123 139 LightSkyBlue4 -198 226 255 SlateGray1 -185 211 238 SlateGray2 -159 182 205 SlateGray3 -108 123 139 SlateGray4 -202 225 255 LightSteelBlue1 -188 210 238 LightSteelBlue2 -162 181 205 LightSteelBlue3 -110 123 139 LightSteelBlue4 -191 239 255 LightBlue1 -178 223 238 LightBlue2 -154 192 205 LightBlue3 -104 131 139 LightBlue4 -224 255 255 LightCyan1 -209 238 238 LightCyan2 -180 205 205 LightCyan3 -122 139 139 LightCyan4 -187 255 255 PaleTurquoise1 -174 238 238 PaleTurquoise2 -150 205 205 PaleTurquoise3 -102 139 139 PaleTurquoise4 -152 245 255 CadetBlue1 -142 229 238 CadetBlue2 -122 197 205 CadetBlue3 - 83 134 139 CadetBlue4 - 0 245 255 turquoise1 - 0 229 238 turquoise2 - 0 197 205 turquoise3 - 0 134 139 turquoise4 - 0 255 255 cyan1 - 0 238 238 cyan2 - 0 205 205 cyan3 - 0 139 139 cyan4 -151 255 255 DarkSlateGray1 -141 238 238 DarkSlateGray2 -121 205 205 DarkSlateGray3 - 82 139 139 DarkSlateGray4 -127 255 212 aquamarine1 -118 238 198 aquamarine2 -102 205 170 aquamarine3 - 69 139 116 aquamarine4 -193 255 193 DarkSeaGreen1 -180 238 180 DarkSeaGreen2 -155 205 155 DarkSeaGreen3 -105 139 105 DarkSeaGreen4 - 84 255 159 SeaGreen1 - 78 238 148 SeaGreen2 - 67 205 128 SeaGreen3 - 46 139 87 SeaGreen4 -154 255 154 PaleGreen1 -144 238 144 PaleGreen2 -124 205 124 PaleGreen3 - 84 139 84 PaleGreen4 - 0 255 127 SpringGreen1 - 0 238 118 SpringGreen2 - 0 205 102 SpringGreen3 - 0 139 69 SpringGreen4 - 0 255 0 green1 - 0 238 0 green2 - 0 205 0 green3 - 0 139 0 green4 -127 255 0 chartreuse1 -118 238 0 chartreuse2 -102 205 0 chartreuse3 - 69 139 0 chartreuse4 -192 255 62 OliveDrab1 -179 238 58 OliveDrab2 -154 205 50 OliveDrab3 -105 139 34 OliveDrab4 -202 255 112 DarkOliveGreen1 -188 238 104 DarkOliveGreen2 -162 205 90 DarkOliveGreen3 -110 139 61 DarkOliveGreen4 -255 246 143 khaki1 -238 230 133 khaki2 -205 198 115 khaki3 -139 134 78 khaki4 -255 236 139 LightGoldenrod1 -238 220 130 LightGoldenrod2 -205 190 112 LightGoldenrod3 -139 129 76 LightGoldenrod4 -255 255 224 LightYellow1 -238 238 209 LightYellow2 -205 205 180 LightYellow3 -139 139 122 LightYellow4 -255 255 0 yellow1 -238 238 0 yellow2 -205 205 0 yellow3 -139 139 0 yellow4 -255 215 0 gold1 -238 201 0 gold2 -205 173 0 gold3 -139 117 0 gold4 -255 193 37 goldenrod1 -238 180 34 goldenrod2 -205 155 29 goldenrod3 -139 105 20 goldenrod4 -255 185 15 DarkGoldenrod1 -238 173 14 DarkGoldenrod2 -205 149 12 DarkGoldenrod3 -139 101 8 DarkGoldenrod4 -255 193 193 RosyBrown1 -238 180 180 RosyBrown2 -205 155 155 RosyBrown3 -139 105 105 RosyBrown4 -255 106 106 IndianRed1 -238 99 99 IndianRed2 -205 85 85 IndianRed3 -139 58 58 IndianRed4 -255 130 71 sienna1 -238 121 66 sienna2 -205 104 57 sienna3 -139 71 38 sienna4 -255 211 155 burlywood1 -238 197 145 burlywood2 -205 170 125 burlywood3 -139 115 85 burlywood4 -255 231 186 wheat1 -238 216 174 wheat2 -205 186 150 wheat3 -139 126 102 wheat4 -255 165 79 tan1 -238 154 73 tan2 -205 133 63 tan3 -139 90 43 tan4 -255 127 36 chocolate1 -238 118 33 chocolate2 -205 102 29 chocolate3 -139 69 19 chocolate4 -255 48 48 firebrick1 -238 44 44 firebrick2 -205 38 38 firebrick3 -139 26 26 firebrick4 -255 64 64 brown1 -238 59 59 brown2 -205 51 51 brown3 -139 35 35 brown4 -255 140 105 salmon1 -238 130 98 salmon2 -205 112 84 salmon3 -139 76 57 salmon4 -255 160 122 LightSalmon1 -238 149 114 LightSalmon2 -205 129 98 LightSalmon3 -139 87 66 LightSalmon4 -255 165 0 orange1 -238 154 0 orange2 -205 133 0 orange3 -139 90 0 orange4 -255 127 0 DarkOrange1 -238 118 0 DarkOrange2 -205 102 0 DarkOrange3 -139 69 0 DarkOrange4 -255 114 86 coral1 -238 106 80 coral2 -205 91 69 coral3 -139 62 47 coral4 -255 99 71 tomato1 -238 92 66 tomato2 -205 79 57 tomato3 -139 54 38 tomato4 -255 69 0 OrangeRed1 -238 64 0 OrangeRed2 -205 55 0 OrangeRed3 -139 37 0 OrangeRed4 -255 0 0 red1 -238 0 0 red2 -205 0 0 red3 -139 0 0 red4 -215 7 81 DebianRed -255 20 147 DeepPink1 -238 18 137 DeepPink2 -205 16 118 DeepPink3 -139 10 80 DeepPink4 -255 110 180 HotPink1 -238 106 167 HotPink2 -205 96 144 HotPink3 -139 58 98 HotPink4 -255 181 197 pink1 -238 169 184 pink2 -205 145 158 pink3 -139 99 108 pink4 -255 174 185 LightPink1 -238 162 173 LightPink2 -205 140 149 LightPink3 -139 95 101 LightPink4 -255 130 171 PaleVioletRed1 -238 121 159 PaleVioletRed2 -205 104 137 PaleVioletRed3 -139 71 93 PaleVioletRed4 -255 52 179 maroon1 -238 48 167 maroon2 -205 41 144 maroon3 -139 28 98 maroon4 -255 62 150 VioletRed1 -238 58 140 VioletRed2 -205 50 120 VioletRed3 -139 34 82 VioletRed4 -255 0 255 magenta1 -238 0 238 magenta2 -205 0 205 magenta3 -139 0 139 magenta4 -255 131 250 orchid1 -238 122 233 orchid2 -205 105 201 orchid3 -139 71 137 orchid4 -255 187 255 plum1 -238 174 238 plum2 -205 150 205 plum3 -139 102 139 plum4 -224 102 255 MediumOrchid1 -209 95 238 MediumOrchid2 -180 82 205 MediumOrchid3 -122 55 139 MediumOrchid4 -191 62 255 DarkOrchid1 -178 58 238 DarkOrchid2 -154 50 205 DarkOrchid3 -104 34 139 DarkOrchid4 -155 48 255 purple1 -145 44 238 purple2 -125 38 205 purple3 - 85 26 139 purple4 -171 130 255 MediumPurple1 -159 121 238 MediumPurple2 -137 104 205 MediumPurple3 - 93 71 139 MediumPurple4 -255 225 255 thistle1 -238 210 238 thistle2 -205 181 205 thistle3 -139 123 139 thistle4 - 0 0 0 gray0 - 0 0 0 grey0 - 3 3 3 gray1 - 3 3 3 grey1 - 5 5 5 gray2 - 5 5 5 grey2 - 8 8 8 gray3 - 8 8 8 grey3 - 10 10 10 gray4 - 10 10 10 grey4 - 13 13 13 gray5 - 13 13 13 grey5 - 15 15 15 gray6 - 15 15 15 grey6 - 18 18 18 gray7 - 18 18 18 grey7 - 20 20 20 gray8 - 20 20 20 grey8 - 23 23 23 gray9 - 23 23 23 grey9 - 26 26 26 gray10 - 26 26 26 grey10 - 28 28 28 gray11 - 28 28 28 grey11 - 31 31 31 gray12 - 31 31 31 grey12 - 33 33 33 gray13 - 33 33 33 grey13 - 36 36 36 gray14 - 36 36 36 grey14 - 38 38 38 gray15 - 38 38 38 grey15 - 41 41 41 gray16 - 41 41 41 grey16 - 43 43 43 gray17 - 43 43 43 grey17 - 46 46 46 gray18 - 46 46 46 grey18 - 48 48 48 gray19 - 48 48 48 grey19 - 51 51 51 gray20 - 51 51 51 grey20 - 54 54 54 gray21 - 54 54 54 grey21 - 56 56 56 gray22 - 56 56 56 grey22 - 59 59 59 gray23 - 59 59 59 grey23 - 61 61 61 gray24 - 61 61 61 grey24 - 64 64 64 gray25 - 64 64 64 grey25 - 66 66 66 gray26 - 66 66 66 grey26 - 69 69 69 gray27 - 69 69 69 grey27 - 71 71 71 gray28 - 71 71 71 grey28 - 74 74 74 gray29 - 74 74 74 grey29 - 77 77 77 gray30 - 77 77 77 grey30 - 79 79 79 gray31 - 79 79 79 grey31 - 82 82 82 gray32 - 82 82 82 grey32 - 84 84 84 gray33 - 84 84 84 grey33 - 87 87 87 gray34 - 87 87 87 grey34 - 89 89 89 gray35 - 89 89 89 grey35 - 92 92 92 gray36 - 92 92 92 grey36 - 94 94 94 gray37 - 94 94 94 grey37 - 97 97 97 gray38 - 97 97 97 grey38 - 99 99 99 gray39 - 99 99 99 grey39 -102 102 102 gray40 -102 102 102 grey40 -105 105 105 gray41 -105 105 105 grey41 -107 107 107 gray42 -107 107 107 grey42 -110 110 110 gray43 -110 110 110 grey43 -112 112 112 gray44 -112 112 112 grey44 -115 115 115 gray45 -115 115 115 grey45 -117 117 117 gray46 -117 117 117 grey46 -120 120 120 gray47 -120 120 120 grey47 -122 122 122 gray48 -122 122 122 grey48 -125 125 125 gray49 -125 125 125 grey49 -127 127 127 gray50 -127 127 127 grey50 -130 130 130 gray51 -130 130 130 grey51 -133 133 133 gray52 -133 133 133 grey52 -135 135 135 gray53 -135 135 135 grey53 -138 138 138 gray54 -138 138 138 grey54 -140 140 140 gray55 -140 140 140 grey55 -143 143 143 gray56 -143 143 143 grey56 -145 145 145 gray57 -145 145 145 grey57 -148 148 148 gray58 -148 148 148 grey58 -150 150 150 gray59 -150 150 150 grey59 -153 153 153 gray60 -153 153 153 grey60 -156 156 156 gray61 -156 156 156 grey61 -158 158 158 gray62 -158 158 158 grey62 -161 161 161 gray63 -161 161 161 grey63 -163 163 163 gray64 -163 163 163 grey64 -166 166 166 gray65 -166 166 166 grey65 -168 168 168 gray66 -168 168 168 grey66 -171 171 171 gray67 -171 171 171 grey67 -173 173 173 gray68 -173 173 173 grey68 -176 176 176 gray69 -176 176 176 grey69 -179 179 179 gray70 -179 179 179 grey70 -181 181 181 gray71 -181 181 181 grey71 -184 184 184 gray72 -184 184 184 grey72 -186 186 186 gray73 -186 186 186 grey73 -189 189 189 gray74 -189 189 189 grey74 -191 191 191 gray75 -191 191 191 grey75 -194 194 194 gray76 -194 194 194 grey76 -196 196 196 gray77 -196 196 196 grey77 -199 199 199 gray78 -199 199 199 grey78 -201 201 201 gray79 -201 201 201 grey79 -204 204 204 gray80 -204 204 204 grey80 -207 207 207 gray81 -207 207 207 grey81 -209 209 209 gray82 -209 209 209 grey82 -212 212 212 gray83 -212 212 212 grey83 -214 214 214 gray84 -214 214 214 grey84 -217 217 217 gray85 -217 217 217 grey85 -219 219 219 gray86 -219 219 219 grey86 -222 222 222 gray87 -222 222 222 grey87 -224 224 224 gray88 -224 224 224 grey88 -227 227 227 gray89 -227 227 227 grey89 -229 229 229 gray90 -229 229 229 grey90 -232 232 232 gray91 -232 232 232 grey91 -235 235 235 gray92 -235 235 235 grey92 -237 237 237 gray93 -237 237 237 grey93 -240 240 240 gray94 -240 240 240 grey94 -242 242 242 gray95 -242 242 242 grey95 -245 245 245 gray96 -245 245 245 grey96 -247 247 247 gray97 -247 247 247 grey97 -250 250 250 gray98 -250 250 250 grey98 -252 252 252 gray99 -252 252 252 grey99 -255 255 255 gray100 -255 255 255 grey100 -169 169 169 dark grey -169 169 169 DarkGrey -169 169 169 dark gray -169 169 169 DarkGray -0 0 139 dark blue -0 0 139 DarkBlue -0 139 139 dark cyan -0 139 139 DarkCyan -139 0 139 dark magenta -139 0 139 DarkMagenta -139 0 0 dark red -139 0 0 DarkRed -144 238 144 light green -144 238 144 LightGreen diff --git a/net-misc/nx-X11/files/unbranded.diff b/net-misc/nx-X11/files/unbranded.diff deleted file mode 100644 index 7a2b4d02..00000000 --- a/net-misc/nx-X11/files/unbranded.diff +++ /dev/null @@ -1,55 +0,0 @@ ---- a/nxagent/programs/Xserver/hw/nxagent/Screen.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Screen.c -@@ -1539,7 +1539,20 @@ - #ifdef TEST - fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n", - nxagentDefaultWindows[pScreen->myNum]); -+ -+ fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n", -+ nxagentDefaultWindows[pScreen->myNum]); - #endif -+ -+ XClassHint hint; -+ hint.res_name=malloc(strlen(HINT)+1); -+ hint.res_class=malloc(strlen(HINT)+1); -+ strcpy(hint.res_name,HINT); -+ strcpy(hint.res_class,HINT); -+ XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint); -+ free(hint.res_name); -+ free(hint.res_class); -+ - - if (nxagentOption(Fullscreen)) - { ---- a/nxagent/programs/Xserver/hw/nxagent/Screen.h -+++ b/nxagent/programs/Xserver/hw/nxagent/Screen.h -@@ -36,6 +36,8 @@ - #define MIN_NXAGENT_HEIGHT 60 - #define NXAGENT_FRAME_WIDTH 2000 - -+#define HINT "NXAgent" -+ - #define nxagentSetPrintGeometry(screen) \ - nxagentPrintGeometryFlags = (1 << (screen)); - ---- a/nxagent/programs/Xserver/hw/nxagent/Display.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Display.c -@@ -1861,7 +1861,7 @@ - strncpy(default_path, "", 255); - - strcat(icon_filename, NXAGENT_ICON_NAME); -- strcat(default_path,"/usr/NX/share/images/"); -+ strcat(default_path,"/usr/share/pixmaps/"); - strcat(default_path,icon_filename); - - if ((icon_fp = fopen(default_path, "r")) == NULL) ---- a/nxagent/programs/Xserver/hw/nxagent/Splash.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Splash.c -@@ -204,6 +204,7 @@ - - nxagentPixmapLogo = XCreatePixmap(nxagentDisplay, win, width, height, nxagentLogoDepth); - -+ return; - if (!nxagentPixmapLogo) - { - return; diff --git a/net-misc/nx-X11/metadata.xml b/net-misc/nx-X11/metadata.xml deleted file mode 100644 index 46a44e57..00000000 --- a/net-misc/nx-X11/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -no-herd - - @gentoo.org - - - - - diff --git a/net-misc/nx-X11/nx-X11-3.4.0_p4.ebuild b/net-misc/nx-X11/nx-X11-3.4.0_p4.ebuild deleted file mode 100644 index 913feaf4..00000000 --- a/net-misc/nx-X11/nx-X11-3.4.0_p4.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.4.0-r1.ebuild,v 1.1 2010/02/09 23:25:04 voyageur Exp $ - -EAPI=2 - -MY_PVV=${PV/_p/-} -MY_PV=${PV/_p*/} -NXAGENT_VER="11" -NXAUTH_VER="3" - - -inherit autotools eutils multilib - -DESCRIPTION="NX compression technology core libraries" -HOMEPAGE="http://www.nomachine.com/developers.php" - -URI_BASE="http://web04.nomachine.com/download/${MY_PV}/sources" -SRC_NX_X11="nx-X11-${MY_PVV}.tar.gz" -SRC_NXAGENT="nxagent-${MY_PV}-${NXAGENT_VER}.tar.gz" -SRC_NXAUTH="nxauth-${MY_PV}-${NXAUTH_VER}.tar.gz" - -SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXAUTH" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-libs/freetype - x11-libs/libXcomposite - x11-libs/libXfixes - x11-libs/libXpm - >=media-libs/jpeg-6b-r4 - >=media-libs/libpng-1.2.8 - >=sys-libs/zlib-1.2.3 - >=net-misc/nxcomp-${MY_PV} - >=net-misc/nxcompext-${MY_PV} - >=net-misc/nxcompshad-${MY_PV}" - -DEPEND="${RDEPEND} - x11-misc/gccmakedep - x11-misc/imake - x11-proto/inputproto" - -S=${WORKDIR}/${PN} - -src_prepare() { - # Fix sandbox violation - epatch "${FILESDIR}"/nx-x11-1.5.0-tmp-exec.patch - # Use System nxcomp - epatch "${FILESDIR}"/01_build_nx-X11_without_nxcomp.dpatch - # use System nxcompshad - epatch "${FILESDIR}"/02_dont_build_nxcompshad.dpatch - # Rename the nx patched x11 libs - epatch "${FILESDIR}"/85_nx-X11_debian-ld.dpatch - # search in system rgb path for the rgb file - epatch "${FILESDIR}"/86_set_rgb_path.dpatch - # Change system security policy path - epatch "${FILESDIR}"/87_set_securitypolicy_path.dpatch - # set location for the X0 keyboard file - epatch "${FILESDIR}"/90_set_X0-config_path.dpatch - # Export Keyboard config - epatch "${FILESDIR}"/93_export_remote_keyboard_config.dpatch - # Fix Makefiles for external libs - epatch "${FILESDIR}"/95_fix_Imakefile.dpatch - # Add utf8 support to the clipboard in nx session - epatch "${FILESDIR}"/nx-X11-utf8_copy_clipboard.patch - # prevent sending COMPOUND_TEXT to client - epatch "${FILESDIR}"/nx-X11-dimbor.patch - # add a timeout to closewindow for wine - epatch "${FILESDIR}"/nxa_wine_close_delay.patch - # add locale support to nxagent - epatch "${FILESDIR}"/nxagent.MotifWMHints_Utf8Names.dimbor.patch - # dont crash on to big pixmaps - epatch "${FILESDIR}"/createpixmap_bounds_check.patch - # remove nomachine branding - epatch "${FILESDIR}"/unbranded.diff - # find nx header - epatch "${FILESDIR}"/nx-X11-3.4.0-Imake-fix-1.patch - - - - # From xorg-x11-6.9.0-r3.ebuild - cd "${S}" - [ -e programs/Xserver/hw/nxagent ] || cp -r nxagent/programs/Xserver/hw/nxagent programs/Xserver/hw/ - HOSTCONF="config/cf/host.def" - echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF} - echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF} - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF} -} - -src_compile() { - # Again, from xorg-x11-6.9.0-r3.ebuild - unset MAKE_OPTS - FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "nx-X11 emake failed" -} - -src_install() { - dobin "${S}"/programs/Xserver/nxagent - dobin "${S}"/programs/nxauth/nxauth - - dolib.so "${S}"/lib/X11/libX11-nx.so* - dolib.so "${S}"/lib/Xext/libXext-nx.so* - dolib.so "${S}"/lib/Xrender/libXrender-nx.so* - - insinto /usr/include/nx - doins "${S}"/programs/Xserver/hw/nxagent/*.h - doins "${S}"/programs/Xserver/include/dix.h - doins -r "${S}"/exports/include/* - - insinto /etc/nxagent - doins "${FILESDIR}"/nxagent.keyboard - - insinto /usr/share/nxagent - doins "${FILESDIR}"/rgb - doins "${S}"/programs/Xserver/Xext/SecurityPolicy - - insinto /usr/share/pixmaps - doins "${S}"/programs/Xserver/hw/nxagent/nxagent.xpm - - doman "${FILESDIR}"/nxagent.1 -} diff --git a/net-misc/nx/nx-3.4.0_p3.ebuild b/net-misc/nx/nx-3.4.0_p3.ebuild deleted file mode 100644 index 74f2fec6..00000000 --- a/net-misc/nx/nx-3.4.0_p3.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/acl/acl-0.ebuild,v 1.2 2009/12/29 01:57:38 abcd Exp $ - -MY_PV="${PV/_p*//}" - -DESCRIPTION="Virtual for the split nx packages" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="" - -DEPEND="" -RDEPEND=">=net-misc/nxproxy-${MY_PV} - >=net-misc/nx-X11-${MY_PV}" diff --git a/net-misc/nxcomp/ChangeLog b/net-misc/nxcomp/ChangeLog deleted file mode 100644 index a92c236e..00000000 --- a/net-misc/nxcomp/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -# ChangeLog for net-misc/nxcomp -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 14 Jun 2010; Mario Fetka nxcomp-3.4.0_p7.ebuild: - correct block on old version - - 14 Jun 2010; Mario Fetka nxcomp-3.4.0_p7.ebuild: - correct dependencies - - 14 Jun 2010; Mario Fetka - +files/nxcomp-1.5.0-pic.patch, +files/nxcomp-3.3.0-cflags.patch, - +nxcomp-3.4.0_p7.ebuild, +metadata.xml: - Initial checkin - diff --git a/net-misc/nxcomp/Manifest b/net-misc/nxcomp/Manifest deleted file mode 100644 index 4b9de9db..00000000 --- a/net-misc/nxcomp/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX nxcomp-1.5.0-pic.patch 522 SHA256 d4fb814d5ee3bd13c39e535b731caab0acb9e552cea471c602c8ff9c8e6d535e SHA512 14e5dc5ea280704d867af971bced585adfd805f49ed70162c4b1691b81926b144720e5df1fc1257e0b3a9e5841fed0deea3a7096d92a210476c1bfd89112c52f WHIRLPOOL b4341346200fb951342535f566d5849183655a6f014be6f9f985e1da087222491b9503f9548506927ec240eaece7829828e1a8690aaf8bcb0d5d402c6c207d34 -AUX nxcomp-3.3.0-cflags.patch 332 SHA256 51b832ac982eb68ee857a0f09c5776831e8fb17a5fe8c6dac0417cdfadf2455c SHA512 332257f794ad2258ab0c36481802c2a13c8e3aa652ba68ca9ddb6da36e3a300d8b53eb3f54ff7b59d2a0e906ed187b0736043a8f785a7634ed5698beb1b585a3 WHIRLPOOL b47a4221f695cb1133d1ccf1744d6b1fe242d33cd4969df7689de0f7fac4f2c2b177a16be950f58d5e4d88fa0ce0b0bba24467c9b1f866c92bf44a139b957d91 -DIST nxcomp-3.4.0-7.tar.gz 535623 SHA256 1c9eb63e46ae263899aec08c017c6af93b0632883ec916d465df9e438229e485 -EBUILD nxcomp-3.4.0_p7.ebuild 927 SHA256 01486ba5188058420515af781168ca82b06923168e8d26a6e3cc560882d6d380 SHA512 ec4c380a6804ef80c744305b8e199403faaa795e6b7656e0aeb7152cdfe1a4186007372f72d30985164c9fc2534dac6a9d50f4cf06b15cf21003425342a66fc6 WHIRLPOOL 65133fc91d2b5a18bba161e45b2d8fa1bae908115f976df0decf72514be87918ae282c758e3a824e505b97c37ff33003bd833eeabff132b08e892b4c488b6353 -MISC ChangeLog 501 SHA256 8bf98042669747622692378bc2ab85ed3ecea3bb1a89f5512a741ac3fde6b0b4 SHA512 f2f3f6b90ad81e4bacb3ff2dd63219b5f85da6ddd92fca6ca3f5878220b51e4710bd44789a8aa4553b04a287a674291a1bc4366f48d54ad752ac75f6d8655fff WHIRLPOOL ae74f1e28d39504e8cac9b406bd41071e55d19df85875f139f588dd1b8dcef31269be7ae18c686b04b5e5abf74b98b3f33b97e37ccf1825b16e3bd5a50f14ce3 -MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9 diff --git a/net-misc/nxcomp/files/nxcomp-1.5.0-pic.patch b/net-misc/nxcomp/files/nxcomp-1.5.0-pic.patch deleted file mode 100644 index 2ccaf978..00000000 --- a/net-misc/nxcomp/files/nxcomp-1.5.0-pic.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- nxcomp/Makefile.in.agriffis 2005-11-12 12:48:42.000000000 -0500 -+++ nxcomp/Makefile.in 2005-12-15 12:24:46.000000000 -0500 -@@ -32,7 +32,7 @@ - - CXX = @CXX@ - CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ -- -Wall -Wpointer-arith -+ -Wall -Wpointer-arith -fPIC - CXXINCLUDES = - CXXDEFINES = - -@@ -42,7 +42,7 @@ - - CC = @CC@ - CCFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ \ -- -Wall -Wpointer-arith -+ -Wall -Wpointer-arith -fPIC - CCINCLUDES = - CCDEFINES = - diff --git a/net-misc/nxcomp/files/nxcomp-3.3.0-cflags.patch b/net-misc/nxcomp/files/nxcomp-3.3.0-cflags.patch deleted file mode 100644 index ce14b408..00000000 --- a/net-misc/nxcomp/files/nxcomp-3.3.0-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100 -+++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100 -@@ -7,8 +7,7 @@ - - dnl Set our default compilation flags. - --CXXFLAGS="-O3 -fno-rtti -fno-exceptions" --CFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" - - dnl Reset default linking directives. - diff --git a/net-misc/nxcomp/metadata.xml b/net-misc/nxcomp/metadata.xml deleted file mode 100644 index 46a44e57..00000000 --- a/net-misc/nxcomp/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -no-herd - - @gentoo.org - - - - - diff --git a/net-misc/nxcomp/nxcomp-3.4.0_p7.ebuild b/net-misc/nxcomp/nxcomp-3.4.0_p7.ebuild deleted file mode 100644 index a6a99a3a..00000000 --- a/net-misc/nxcomp/nxcomp-3.4.0_p7.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -MY_P=${P/_p/-} -MY_PV=${PV/_p*/} - -inherit autotools eutils multilib - -DESCRIPTION="NX compression technology core libraries" -HOMEPAGE="http://www.nomachine.com/developers.php" -SRC_URI="http://web04.nomachine.com/download/${MY_PV}/sources/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=media-libs/jpeg-6b-r4 - >=media-libs/libpng-1.2.8 - >=sys-libs/zlib-1.2.3 - ! - nxcompext-3.4.0_p1.ebuild: - correct block on old version - - 14 Jun 2010; Mario Fetka - nxcompext-3.4.0_p1.ebuild: - correct dependencies - - 14 Jun 2010; Mario Fetka - +nxcompext-3.4.0_p1.ebuild, - +files/nxcompext-3.4.0-NXlib-xgetioerror.patch, - +files/nxcompext-3.4.0-cflags.patch, - +files/nxcompext-3.4.0-no-local-nxcomp.patch, +metadata.xml: - Initial checkin - diff --git a/net-misc/nxcompext/Manifest b/net-misc/nxcompext/Manifest deleted file mode 100644 index ef6e2891..00000000 --- a/net-misc/nxcompext/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX nxcompext-3.4.0-NXlib-xgetioerror.patch 668 SHA256 3e0ac8d9de1364905e31e848f2fe560e3aebd134aaa2687e2657e5f3b67e5241 SHA512 38b676f6b89f74fc32adcfad71d65740128c2025d50e7dae454b3872745e405f2af420374d35595b02b41c1ce27839f3c965c0816b8179bd3cbbd72a0d1f607e WHIRLPOOL 912216187752d55ee353c5bd4cd5c176c9c8cc55ac561dd5ebe47a08c05bc1e185bf56f163ea3fa88e2bb441ba7dad7572d6ce9f1c1e8d7f0a5548dab6fbc727 -AUX nxcompext-3.4.0-cflags.patch 440 SHA256 33fea3a9f40a63a3a01684931b08bae87194c24ba92a58819fb2c6f58f9d51af SHA512 c9a9e7cd5095ff13978d102bdc566e7c93d9e06ca7dfbcdcaab1c4e1192dcfdc9cda5fab3a887e0bb9522c56a350de4ed977131a2be5d3ab6a4fbccc7c2e3b8c WHIRLPOOL 49624f509da4718e89885de3c102f143a385472a5c4063155bda35e80daf2d7f49fa03c3d8ca0547eddede06839db300d44277594bd0eeb8e2ce33631d571b1c -AUX nxcompext-3.4.0-no-local-nxcomp.patch 1268 SHA256 6ad635a96ed22bdb207fbf79fefd64ea21d5b56ee5aaeafd7d4a8de481e7517b SHA512 d2dd9b2da3a6dd190d1d3aa8a95d6df579c979fe333d8b3ba219d0406321faa416b2c20c0d5b89e42b98083b79c295a0a3958e23ce0a5d3481ab5cd19b9c6f29 WHIRLPOOL f367478ad7afcf2c70af660a8ca12f727bdab32f527ba09dfdcd7425e6c2adc1f0159d83948523b4edfc94d7c564fe61ec1494b96c79a748afe77d22440a4e69 -DIST nxcompext-3.4.0-1.tar.gz 90215 SHA256 75be77fe0cdc3aca21afd0b72590d600b131b849b8e65926c237c3d87dd1160e -EBUILD nxcompext-3.4.0_p1.ebuild 1078 SHA256 82fb604290ad42f415dc84aa7ae53ec6bc920befedd58a43b3456d10b929bfbf SHA512 9595bb20ed6476826b69d7cd46add082966a72b21b77afd18e8a8e383c2520c7917db859dd884dd360509a153f2a98a9358b0735c1a446e3a1f95d2e62a1abda WHIRLPOOL 9c3c33d5665dcb6492344a05884dd18a3d826b0c6b0ae0284e7fc492157ecd3f374e45b281e255294ece86989c7d065e2ff6ed473e5ab0c79ebb766f1a0d9d0b -MISC ChangeLog 587 SHA256 61c04062deb0e454a788869b16734e4d8b4ab708e6eb9eb9aa961cdd2e686058 SHA512 d063329d45f243ed12fff0df09da41b9327569e0adb9549527a5d2708e81511be4ab29d2188f01f5268cce944499c5b651c2f9c93dbe379b11b8607230c54774 WHIRLPOOL e4ba2108ec52d959003e379c2238b020a195a15e5ccfd703fceebb84554846802160cd34fefa06b428a0a2e024acdd5c5d98e6452d65427772f441b3f8477e88 -MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9 diff --git a/net-misc/nxcompext/files/nxcompext-3.4.0-NXlib-xgetioerror.patch b/net-misc/nxcompext/files/nxcompext-3.4.0-NXlib-xgetioerror.patch deleted file mode 100644 index cc6275b4..00000000 --- a/net-misc/nxcompext/files/nxcompext-3.4.0-NXlib-xgetioerror.patch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_NXlib-xgetioerror.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Copied and description at the site: -## DP: http://www.felipe-alfaro.org/blog/2007/11/24/installing-freenx-071-on-ubuntu/ - -@DPATCH@ -diff -urNad nxcompext-3.3.0-2~/NXlib.c nxcompext-3.3.0-2/NXlib.c ---- nxcompext-3.3.0-2~/NXlib.c 2007-11-12 13:01:30.000000000 -0200 -+++ nxcompext-3.3.0-2/NXlib.c 2008-11-20 23:13:43.000000000 -0200 -@@ -56,6 +56,9 @@ - - #include "MD5.h" - -+#define _XGetIOError(dpy) \ -+ (dpy -> flags & XlibDisplayIOError) -+ - #define PANIC - #define WARNING - #undef TEST diff --git a/net-misc/nxcompext/files/nxcompext-3.4.0-cflags.patch b/net-misc/nxcompext/files/nxcompext-3.4.0-cflags.patch deleted file mode 100644 index f0f01aba..00000000 --- a/net-misc/nxcompext/files/nxcompext-3.4.0-cflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -Title: Remove hardcoded O3 compiler flag -DEP: 3 -State: CANDIDATE -Date: 2009-12-19 -Abstract: - Remove hardcoded O3 compiler flag - ---- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100 -+++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(NXlib.h) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CFLAGS="-O3" -- - dnl Reset default linking directives. - - LIBSTATIC="" diff --git a/net-misc/nxcompext/files/nxcompext-3.4.0-no-local-nxcomp.patch b/net-misc/nxcompext/files/nxcompext-3.4.0-no-local-nxcomp.patch deleted file mode 100644 index 9eebd1d9..00000000 --- a/net-misc/nxcompext/files/nxcompext-3.4.0-no-local-nxcomp.patch +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_no-local-nxcomp.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: This patch make nxcompext build with system libs - -@DPATCH@ -diff -urNad nxcompext-3.3.0-2~/Makefile.in nxcompext-3.3.0-2/Makefile.in ---- nxcompext-3.3.0-2~/Makefile.in 2007-06-04 10:11:39.000000000 -0300 -+++ nxcompext-3.3.0-2/Makefile.in 2008-11-20 23:13:29.000000000 -0200 -@@ -31,17 +31,17 @@ - CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ - -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ - -Wmissing-declarations -Wnested-externs --CXXINCLUDES = -I. -I../nxcomp -+CXXINCLUDES = -I. -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1 - CXXDEFINES = - - CC = @CC@ - CCFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ \ - -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ - -Wmissing-declarations -Wnested-externs --CCINCLUDES = -I. -I../nxcomp -+CCINCLUDES = -I. -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1 - CCDEFINES = - --LDFLAGS = @LDFLAGS@ -L../nxcomp -+LDFLAGS = @LDFLAGS@ -L/usr/lib/nx/ - LIBS = @LIBS@ -lz -lX11 -lXcomp - - # diff --git a/net-misc/nxcompext/metadata.xml b/net-misc/nxcompext/metadata.xml deleted file mode 100644 index 46a44e57..00000000 --- a/net-misc/nxcompext/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -no-herd - - @gentoo.org - - - - - diff --git a/net-misc/nxcompext/nxcompext-3.4.0_p1.ebuild b/net-misc/nxcompext/nxcompext-3.4.0_p1.ebuild deleted file mode 100644 index 887d58e5..00000000 --- a/net-misc/nxcompext/nxcompext-3.4.0_p1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -MY_P=${P/_p/-} -MY_PV=${PV/_p*/} - -inherit autotools eutils multilib - -DESCRIPTION="NX compression technology core libraries" -HOMEPAGE="http://www.nomachine.com/developers.php" -SRC_URI="http://web04.nomachine.com/download/${MY_PV}/sources/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - >=media-libs/jpeg-6b-r4 - >=media-libs/libpng-1.2.8 - >=sys-libs/zlib-1.2.3 - !=net-misc/nxcomp-${MY_PV}" - -DEPEND="${RDEPEND}" - -S=${WORKDIR}/nxcompext - -src_prepare() { - # Respect CFLAGS/CXXFLAGS - epatch "${FILESDIR}"/nxcompext-3.4.0-cflags.patch - # Use System nxcomp - epatch "${FILESDIR}"/nxcompext-3.4.0-no-local-nxcomp.patch - # IOError - epatch "${FILESDIR}"/nxcompext-3.4.0-NXlib-xgetioerror.patch - # Run autoreconf in all neeed folders - eautoreconf -} - -src_install() { - # Install Libs - dolib libXcompext.a - dolib.so libXcompext.so* - # Install Header - insinto /usr/include/nx - doins NX*.h -} diff --git a/net-misc/nxcompsh/Manifest b/net-misc/nxcompsh/Manifest deleted file mode 100644 index 64ddaeba..00000000 --- a/net-misc/nxcompsh/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX nxcompsh-3.2.0-gcc43.patch 823 SHA256 9f1c2f6b808c4c22c9bf4a6d8e8c89b8d240d1c8d9be1918bea60aece87dc899 SHA512 7c81354d1a859d24715a9249e23995b856a838770ec069a3be4da575dd150a7f0e7e9f2c8b8d5ddbf06ced477b5aa1bb45f5dcdf082c38fd7af3305e956db2cf WHIRLPOOL 7b4671ec9b62c1f6886d8ac7f5a02dd178565fac6f918f5605cca897438216fd15246d572d422c17cc527398a8baa23d8701f966814048f2115cf7b50cd1987d -DIST nxcompsh-3.4.0-2.tar.gz 76941 SHA256 d6d29c59f070ea1ff65901a33e2013902abb3765dc6a8858f5bd6d09eccb6bf0 -EBUILD nxcompsh-3.4.0_p2.ebuild 1113 SHA256 e0a4f678e61343b90b099d820b4db24d7b6bba9d004fa0fcf09badd0fc875222 SHA512 110115b4c07a440a456c6e8199495f076c4daab79f43ace1207e9f1d97a0bd93985b1dd099cda0d4a13f813373055bcc8cde7bd0bdd3aa99dc2b6b6a16d2cf1d WHIRLPOOL a0bfb8a989af2fe698a07f65114bd40f85fcf481fb7cf1143f6e800a02aebb120a846e855629dc1f2adb91850fe400ab7bd233e9d575371833589d5b375911b7 diff --git a/net-misc/nxcompsh/files/nxcompsh-3.2.0-gcc43.patch b/net-misc/nxcompsh/files/nxcompsh-3.2.0-gcc43.patch deleted file mode 100644 index 11155cf5..00000000 --- a/net-misc/nxcompsh/files/nxcompsh-3.2.0-gcc43.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- nxcompsh/Logger.cpp.orig 2008-07-21 17:53:09 +0400 -+++ nxcompsh/Logger.cpp 2008-07-21 17:59:57 +0400 -@@ -26,7 +26,9 @@ - #include "Logger.h" - #include "Timestamp.h" - --#include -+#include -+ -+using namespace std; - - Logger logger; - ---- nxcompsh/Logger.h.orig 2008-07-21 17:53:29 +0400 -+++ nxcompsh/Logger.h 2008-07-21 18:01:53 +0400 -@@ -18,7 +18,7 @@ - #ifndef Logger_H - #define Logger_H - --#include -+#include - #include - - // ---- nxcompsh/Misc.h.orig 2008-07-22 14:10:18 +0400 -+++ nxcompsh/Misc.h 2008-07-22 14:12:38 +0400 -@@ -18,10 +18,13 @@ - #ifndef Misc_H - #define Misc_H - --#include -+#include - --#include --#include -+#include -+#include -+#include -+ -+using namespace std; - - // - // This is MD5 length. diff --git a/net-misc/nxcompsh/nxcompsh-3.4.0_p2.ebuild b/net-misc/nxcompsh/nxcompsh-3.4.0_p2.ebuild deleted file mode 100644 index 731c34de..00000000 --- a/net-misc/nxcompsh/nxcompsh-3.4.0_p2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -MY_P=${P/_p/-} -MY_PV=${PV/_p*/} - -inherit autotools eutils multilib - -DESCRIPTION="NX compression technology core libraries" -HOMEPAGE="http://www.nomachine.com/developers.php" -SRC_URI="http://web04.nomachine.com/download/${MY_PV}/sources/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - >=media-libs/jpeg-6b-r4 - >=media-libs/libpng-1.2.8 - >=sys-libs/zlib-1.2.3 - !=net-misc/nxcomp-${MY_PV}" - -DEPEND="${RDEPEND}" - -S=${WORKDIR}/nxcompsh - -src_prepare() { - # Respect CFLAGS/CXXFLAGS - epatch "${FILESDIR}"/nxcompsh-3.2.0-gcc43.patch - # Use System nxcomp - #epatch "${FILESDIR}"/nxcompext-3.4.0-no-local-nxcomp.patch - # IOError - #epatch "${FILESDIR}"/nxcompext-3.4.0-NXlib-xgetioerror.patch - # Run autoreconf in all neeed folders - eautoreconf -} - -src_install() { - # Install Libs - dolib libXcompsh.a - dolib.so libXcompsh.so* - # Install Header - insinto /usr/include/nx - doins Connector.h Dispatcher.h Event.h Listener.h -} diff --git a/net-misc/nxcompshad/ChangeLog b/net-misc/nxcompshad/ChangeLog deleted file mode 100644 index 5d29303c..00000000 --- a/net-misc/nxcompshad/ChangeLog +++ /dev/null @@ -1,14 +0,0 @@ -# ChangeLog for net-misc/nxcompshad -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 14 Jun 2010; Mario Fetka - nxcompshad-3.4.0_p3.ebuild: - correct block on old version - - 14 Jun 2010; Mario Fetka - +files/nxcompshad-3.2.0-gcc43.patch, +files/nxcompshad-3.3.0-Xext.patch, - +nxcompshad-3.4.0_p3.ebuild, +files/nxcompshad-3.4.0-cflags.patch, - +files/nxcompshad-3.4.0-system_wide_build.patch, +metadata.xml: - Initial checkin - diff --git a/net-misc/nxcompshad/Manifest b/net-misc/nxcompshad/Manifest deleted file mode 100644 index 8094947f..00000000 --- a/net-misc/nxcompshad/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX nxcompshad-3.2.0-gcc43.patch 250 SHA256 035180ebc213e9503f2f8ef0cd4109b0dfb30e423410e6733931d0a5dc0c02be SHA512 706a40f4d54f80f951b2fdb31b38976433952b5ba0b4ad6d0d1597cdf4f160f3acc54f96c497f8d7dc1b3924b82bc905c20978aa9d0f937c91762ba0d6856249 WHIRLPOOL 531dfc85066cd2ee63196739bf5a5bf9d74ab33ee89894fc68c90eac56ce2f3659cf9ac3b93e38cb5565ab5cd711382f004eff3804d91af9f175a2fc4de41507 -AUX nxcompshad-3.3.0-Xext.patch 318 SHA256 84bd4dcbe874be68da537b7b0cbdcb86cd33700f07d3dbb6d11919f09c933ea0 SHA512 250b7928b7f8024339842cf353bbda3af1368f7160e933b4e79408470959b3ffe89cc87a61b1adbef3070c22a6a116cbbdfc873139009b14f51691d125014a8d WHIRLPOOL b9e0bd4517fc37b4500b7b1cdf4fbfac53512216bb01a21cd7d5a785362aa754dd16dfa61824b2d7845f2946b1a3e419b8e1fe2536b10ada3c7442f7b18131eb -AUX nxcompshad-3.4.0-cflags.patch 445 SHA256 9b63d3049a36ee85b7d0abad5c9578846cca1d4620b2acb6dc0fe36293ff27f6 SHA512 adbf80910611da1c37e7940e06844c822a3d960940379aed47f1d381a1cdf0745177753ffad9afebcaac9c9f13f5d5921b965f8b4ea0dd44b35e864266ac8bbc WHIRLPOOL e72c9719d96a7cda2e8c1512cd0961ff1e8ee9e76d5360464dafef3201efa47761cf946e052e2a1e9ec49e8a226af10c14c4d8a3f610fb39f8a9b610ee9f302c -AUX nxcompshad-3.4.0-system_wide_build.patch 695 SHA256 741c13e9e7aa5d2f5bc78a6de50705c44c3d2f66a5e63afecfa5891c378e010a SHA512 437106b5b7365d87b7d54652621587601daebe4a87058b8f5872cb6799efc49427d6378573df50884809a2f70fccea331764c57371efdb2434df11cad73c01c1 WHIRLPOOL 08b40956f9f676397d1ab2eb7b48841f424a5099c49b6c5c85f361ba8b420707f1a597320a8843362a480ab2651c29f33a7047592026f7e0db5709bf5426dbb3 -DIST nxcompshad-3.4.0-3.tar.gz 77220 SHA256 8c5a67ea156afb0fb2a50adbb89b8b26b6f0860cf3f53c45eb53f59ec4deaa98 -EBUILD nxcompshad-3.4.0_p3.ebuild 1231 SHA256 e1c73539c5d1bd262a98f6c91c5f575189ca4ba6b037ea0b9eb37182cc396f05 SHA512 96ee63e715fb0bb7b211ee07e919ab1a54930421e204327d17f6e290df12c2405336c668a023b459ae56ea5d253b027deb93e36449b11dd0282f7d7d63dcdfe4 WHIRLPOOL c3554230a1ab206a226be3d83e37619fc42edf3ee0deda619abaa481423edcdd6bb5a02e603e015141faa326bf3ca2780d04c96b430b12b53b58e52fe8a8a977 -MISC ChangeLog 513 SHA256 fd6c968b3afdcf2f4d6a13617522b1c42ef0e6f4d1eb471bdda985500ffb32f7 SHA512 49337bc833e5803f82ebbe0f606d5f1967ea5ce3584c3774fb8586fbfa1c81afb06bf309a8b5b05551a3a0b6bc725effc829a910e872c91bab3d445d4cd811fe WHIRLPOOL 706bdaa614e37c7575790c75fbb82886a2617f28a8bcfb03779277640dee8eada87f1f23baea3ad115cc4007bbdcb1356aa903b114256fbed89a02bccf106439 -MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9 diff --git a/net-misc/nxcompshad/files/nxcompshad-3.2.0-gcc43.patch b/net-misc/nxcompshad/files/nxcompshad-3.2.0-gcc43.patch deleted file mode 100644 index e5a2c93a..00000000 --- a/net-misc/nxcompshad/files/nxcompshad-3.2.0-gcc43.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- nxcompshad/Misc.h.orig 2008-07-21 18:27:41 +0400 -+++ nxcompshad/Misc.h 2008-07-21 18:31:17 +0400 -@@ -20,8 +20,8 @@ - - #include - --#include --#include -+#include -+#include - - using namespace std; - diff --git a/net-misc/nxcompshad/files/nxcompshad-3.3.0-Xext.patch b/net-misc/nxcompshad/files/nxcompshad-3.3.0-Xext.patch deleted file mode 100644 index 109619ec..00000000 --- a/net-misc/nxcompshad/files/nxcompshad-3.3.0-Xext.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nxcompshad/Makefile.in.orig 2008-12-05 13:57:18 +0300 -+++ nxcompshad/Makefile.in 2008-12-05 13:57:05 +0300 -@@ -48,7 +48,7 @@ CCINCLUDES = - CCDEFINES = - - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 -+LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 -lXext - - # - # Only if THREADS is defined. diff --git a/net-misc/nxcompshad/files/nxcompshad-3.4.0-cflags.patch b/net-misc/nxcompshad/files/nxcompshad-3.4.0-cflags.patch deleted file mode 100644 index 3dcf4baa..00000000 --- a/net-misc/nxcompshad/files/nxcompshad-3.4.0-cflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -Title: Remove hardcoded O3 compiler flag -DEP: 3 -State: CANDIDATE -Date: 2009-12-19 -Abstract: - Remove hardcoded O3 compiler flag - ---- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100 -+++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(Shadow.h) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CPPFLAGS="-O3" -- - dnl Reset default linking directives. - - LIBSTATIC="" diff --git a/net-misc/nxcompshad/files/nxcompshad-3.4.0-system_wide_build.patch b/net-misc/nxcompshad/files/nxcompshad-3.4.0-system_wide_build.patch deleted file mode 100644 index 39f7ceb0..00000000 --- a/net-misc/nxcompshad/files/nxcompshad-3.4.0-system_wide_build.patch +++ /dev/null @@ -1,22 +0,0 @@ -Title: Include headers from system directory -DEP: 3 -State: CANDIDATE -Abstract: - Include headers from system directory - -diff -urNad nxcompshad~/configure.in nxcompshad/configure.in ---- nxcompshad~/configure.in 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompshad/configure.in 2008-06-18 10:00:00.000000000 +0200 -@@ -17,9 +17,9 @@ - - dnl Prefer headers and libraries from nx-X11, if present. - --if test -d "../nx-X11/exports/include" ; then -- CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include" -- LIBS="$LIBS -L../nx-X11/exports/lib" -+if test -d "/usr/include/nx" ; then -+ CXXFLAGS="$CXXFLAGS -I/usr/include/nx" -+ LIBS="$LIBS -L/usr/lib/nx" - fi - - dnl Check whether --with-ipaq was given. diff --git a/net-misc/nxcompshad/metadata.xml b/net-misc/nxcompshad/metadata.xml deleted file mode 100644 index 46a44e57..00000000 --- a/net-misc/nxcompshad/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -no-herd - - @gentoo.org - - - - - diff --git a/net-misc/nxcompshad/nxcompshad-3.4.0_p3.ebuild b/net-misc/nxcompshad/nxcompshad-3.4.0_p3.ebuild deleted file mode 100644 index 89152171..00000000 --- a/net-misc/nxcompshad/nxcompshad-3.4.0_p3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -MY_P=${P/_p/-} -MY_PV=${PV/_p*/} - -inherit autotools eutils multilib - -DESCRIPTION="NX compression technology core libraries" -HOMEPAGE="http://www.nomachine.com/developers.php" -SRC_URI="http://web04.nomachine.com/download/${MY_PV}/sources/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXtst - >=media-libs/jpeg-6b-r4 - >=media-libs/libpng-1.2.8 - >=sys-libs/zlib-1.2.3 - !=net-misc/nxcomp-${MY_PV}" - -DEPEND="${RDEPEND}" - -S=${WORKDIR}/nxcompshad - -src_prepare() { - # Respect CFLAGS/CXXFLAGS - epatch "${FILESDIR}"/nxcompshad-3.4.0-cflags.patch - # Use System nxcomp - epatch "${FILESDIR}"/nxcompshad-3.4.0-system_wide_build.patch - # Gcc 4.3 build problem - epatch "${FILESDIR}"/nxcompshad-3.2.0-gcc43.patch - # link with xext - epatch "${FILESDIR}"/nxcompshad-3.3.0-Xext.patch - # Run autoreconf in all neeed folders - eautoreconf -} - -src_install() { - # Install Libs - dolib libXcompshad.a - dolib.so libXcompshad.so* - # Install Header - insinto /usr/include/nx - doins *.h -} diff --git a/net-misc/nxesd/ChangeLog b/net-misc/nxesd/ChangeLog deleted file mode 100644 index c32b53c1..00000000 --- a/net-misc/nxesd/ChangeLog +++ /dev/null @@ -1,8 +0,0 @@ -# ChangeLog for net-misc/nxesd -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 28 Aug 2010; Mario Fetka - +files/nxesd-3.3.0-esd.patch, +nxesd-3.4.0_p2.ebuild, +metadata.xml: - Bump - diff --git a/net-misc/nxesd/Manifest b/net-misc/nxesd/Manifest deleted file mode 100644 index 28f46a72..00000000 --- a/net-misc/nxesd/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX nxesd-3.3.0-esd.patch 588 SHA256 9805244412ebbeccde35487026f3e3612d208110ef8a6568766cd83297fff8b8 SHA512 56b22618d8c340e7dc6b8b6dff8ee5b0471e24080ca6ad4c4b015eeb3156dbef85fe8e9ae8537b099e344b97c67c263643f74314cbe74764b0b84cbaf56aa362 WHIRLPOOL 348f3bf834ed38928e6f99eaad6755caf4f1e5b6b4f3296b599972b95d6e0e90125900883eb37c2b090ade5327318ab55d7260d779a24654c4843ecb195b9140 -DIST nxesd-3.4.0-2.tar.gz 517575 SHA256 c71a8220612bfeb0e83248a963aa92624c0c496271631922565eb78458d98288 -EBUILD nxesd-3.4.0_p2.ebuild 1395 SHA256 df79562a9179c2722fcb89ac3d356b6dde934ee5df297cc0b4d75348cd144af9 SHA512 c1bfdf4d46b1b2ed70f36095b298605d74614cda64b08cffb75f654fd340cbf5dda949f27f54f0f13b1d5a867c3a17c00e3007ff1886d75f4ab71a378c371c15 WHIRLPOOL cc634b21b2c047d493f9c35b47301b147052b81294d9c988659ee968169016f2b742be43b4c47e00fd73f2ebf42941320c015f5dcd2ce8513e7abd38fc5778c8 -MISC ChangeLog 245 SHA256 1ce510f765558e66aa49dbb286afccb2de82e13a1e079421aa84835f50045dc4 SHA512 e2d52ac4de64cd6655eaf22835d6a60e1c0a85107d63cd536f5e8f0d07773434b9a247e08484088f224201ca575c1a22b5db9ec7ea37c25aa1811137a4f30c88 WHIRLPOOL 549c9a109eea78fb030718d6aae25f739dd2dc9278c025dae9687cb8ee842c5544c07935f85216f0d6b818e142d8cc6714b56ce0770dacd27dc6a6a0a34be736 -MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9 diff --git a/net-misc/nxesd/files/nxesd-3.3.0-esd.patch b/net-misc/nxesd/files/nxesd-3.3.0-esd.patch deleted file mode 100644 index 23619065..00000000 --- a/net-misc/nxesd/files/nxesd-3.3.0-esd.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- nxesd/Makefile.in.orig 2008-12-05 17:07:29 +0300 -+++ nxesd/Makefile.in 2008-12-05 17:47:22 +0300 -@@ -251,7 +251,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P - JW = @JW@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lesd - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -326,7 +326,7 @@ target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ --SUBDIRS = docs -+SUBDIRS = - ACLOCAL_FLAGS = -I m4 - SPEC_FILE = esound.spec - INCLUDES = $(AUDIOFILE_CFLAGS) -DSYSCONFDIR=\"$(sysconfdir)\" \ diff --git a/net-misc/nxesd/metadata.xml b/net-misc/nxesd/metadata.xml deleted file mode 100644 index 46a44e57..00000000 --- a/net-misc/nxesd/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -no-herd - - @gentoo.org - - - - - diff --git a/net-misc/nxesd/nxesd-3.4.0_p2.ebuild b/net-misc/nxesd/nxesd-3.4.0_p2.ebuild deleted file mode 100644 index 480a63ec..00000000 --- a/net-misc/nxesd/nxesd-3.4.0_p2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -MY_P=${P/_p/-} -MY_PV=${PV/_p*/} - -inherit libtool eutils flag-o-matic - -DESCRIPTION="The NX Incarnation of the Enlightened Sound Daemon" -HOMEPAGE="http://www.nomachine.com/developers.php" -SRC_URI="http://web04.nomachine.com/download/${MY_PV}/sources/${MY_P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="alsa doc ipv6 debug oss tcpd" - -COMMON_DEPEND=">=media-libs/audiofile-0.2.3 - media-sound/esound - !net-misc/nxclient - alsa? ( media-libs/alsa-lib ) - doc? ( app-text/docbook-sgml-utils ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )" - -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig" - -RDEPEND="${COMMON_DEPEND}" - -S=${WORKDIR}/nxesd - -src_prepare() { - epatch "${FILESDIR}/nxesd-3.3.0-esd.patch" -} - -src_configure() { - # Strict aliasing issues - append-flags -fno-strict-aliasing - - local myconf - - if ! use alsa; then - myconf="--enable-oss" - else - myconf="$(use_enable oss)" - fi - - econf \ - --sysconfdir=/etc/esd \ - --disable-dependency-tracking \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_enable alsa) \ - --disable-arts \ - --disable-artstest \ - $(use_with tcpd libwrap) \ - ${myconf} -} - -src_install() { - dobin .libs/nxesd - - dodoc AUTHORS CHANGELOG MAINTAINERS NEWS README TIPS TODO -} diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest deleted file mode 100644 index 5363720c..00000000 --- a/net-misc/nxplayer/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST nxplayer-4.0.181-5.i686.tar.gz 11545210 SHA256 fa151b958ec59124709a70371bb8716e6cf85149d05e9f1e7782b250b345bfc5 SHA512 4d9f97a59f337ca91f25061581262ea3d3925613f57c74a96e8a6394fbeea97a7ae79182949bcc23c063d573423169cbddbc2cf2d5b832b8e927474a4d2d4152 WHIRLPOOL 347db9f83b18eebbdfb18a882f9c1c3420d020b70da86b67951cadf3036a666fc8ec7f7c031d0db51590d8cb8ac3cf5eebe3b5ef4e44f05cb085cbd31796dd32 -DIST nxplayer-4.0.181-5.x86_64.tar.gz 11933443 SHA256 39a7fa01688f35a464c197ac8ca32929a33921d6e66033c1cfc70e24539173f6 SHA512 a04572084fc188554058af0344d87a211a5b52cd4c72f3dd2dfef13e010eb4e06f6c7fe5d814d90e238272a56c01af1c5bbccbd859be305134827425a9f0508f WHIRLPOOL d58d89da58ee894c40395e6f5dffb3d290d9a602c357bbb359e001e21d6c92bebf64fd8111a1b03c7d3fd40b0ee22801de27587caca325eb87f0b24c337e80b0 -EBUILD nxplayer-4.0.181.5.ebuild 1489 SHA256 24a39bb6e5d4376cd12367770fdcb53a316547899780fcb97fea04929dbcc9ed SHA512 a18a13cb8a56428ec2d41a140a24c7190870253e30a353866085178c0cac4e1b7c03bf9416451cbd48b1dba5f6abd244b57c33d844477f9e5ef5ac1836cf44f8 WHIRLPOOL c7db419a940def5456d3ea7797a385fb5f4125b318cdb8e72f326b9947a94e4d1a9826330f663cba35834e1c75543eb3c21dc7ea33a1dcb80f8b15bc90be857d diff --git a/net-misc/nxplayer/nxplayer-4.0.181.5.ebuild b/net-misc/nxplayer/nxplayer-4.0.181.5.ebuild deleted file mode 100644 index 3e159441..00000000 --- a/net-misc/nxplayer/nxplayer-4.0.181.5.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-3.4.0.7-r1.ebuild,v 1.1 2010/12/22 09:47:27 voyageur Exp $ - -EAPI=2 -inherit eutils versionator - -MAJOR_PV="$(get_version_component_range 1-3)" -FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)" -DESCRIPTION="New NX client interface" -HOMEPAGE="http://www.nomachine.com/" -SRC_URI="amd64? ( http://64.34.173.142/download/4.0/Linux/nxplayer-${FULL_PV}.x86_64.tar.gz ) - x86? ( http://64.34.173.142/download/4.0/Linux/nxplayer-${FULL_PV}.i686.tar.gz )" -LICENSE="nomachine" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" -RESTRICT="strip" - -DEPEND="" -RDEPEND="x11-libs/libXft - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXau" - -S=${WORKDIR}/NX/etc/NX/player/packages/ - -src_install() -{ - local NXROOT=/opt/NX - -# dodir /etc/NX/localhost -# echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg - - dodir /opt - tar xozf nxclient.tar.gz -C "${D}"/opt - tar xozf nxplayer.tar.gz -C "${D}"/opt - - make_wrapper nxplayer ./nxplayer ${NXROOT}/bin ${NXROOT}/lib || die - # Add icons/desktop entries (missing in the tarball) - cd "${D}"/${NXROOT}/share/icons - for size in *; do - dodir /usr/share/icons/hicolor/${size}/apps - for icon in desktop icon; do - dosym /usr/NX/share/icons/${size}/nxplayer-${icon}.png \ - /usr/share/icons/hicolor/${size}/apps - done - done - make_desktop_entry "nxplayer" "NX Player" nxplayer-icon -} diff --git a/net-misc/nxproxy/ChangeLog b/net-misc/nxproxy/ChangeLog deleted file mode 100644 index f1f114a8..00000000 --- a/net-misc/nxproxy/ChangeLog +++ /dev/null @@ -1,11 +0,0 @@ -# ChangeLog for net-misc/nxproxy -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 14 Jun 2010; Mario Fetka - +files/nxproxy-3.2.0-read_from_stdin.patch, - +files/nxproxy-3.3.0-cflags.patch, +nxproxy-3.4.0_p2.ebuild, - +files/nxproxy-3.4.0-build_destdir.patch, - +files/nxproxy-3.4.0-no-local-nxcomp-1.patch, +metadata.xml: - Initial checkin - diff --git a/net-misc/nxproxy/Manifest b/net-misc/nxproxy/Manifest deleted file mode 100644 index 17c9aa10..00000000 --- a/net-misc/nxproxy/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX nxproxy-3.2.0-read_from_stdin.patch 1489 SHA256 758f5149ce2df91913e65193380613ba97353126a782c67327e4516af5c55606 SHA512 8f2ed6df2571271af772aa907f758cb6e7db0c54a5c086e6ce02852276bd1d4d9b98e7ce435fd75c648eed9b5f2f6a855010e5eccbc74bacb6cba16fd42a3b36 WHIRLPOOL b41d5483fd3c6d2a4936081a03d10863d4bb43578a1a8e319fc1585ba52fe6ea9172906f5c94b186ea68b00867b40520735592924aa5641ad794968f71a80b6a -AUX nxproxy-3.3.0-cflags.patch 361 SHA256 48dd9bab2bf90f31f6a6b0e960c754ae699cbb14adceb1480845b1cbf4be6279 SHA512 ac109e9766f9438080bb638118dce2777fbffb4b8a57795e6ceac592eda83c38171a8b96179031a2dacb78d6eab78fd917ca6bb5852f8462fe199248748a26d3 WHIRLPOOL 11e5bfa2076008863ba84f6372a981061005e7a08695955d7b4f901a325e819c39ee0a93bb26a9f04b11035a426796e9c92fecca4c0ce79a083aeeab86002389 -AUX nxproxy-3.4.0-build_destdir.patch 539 SHA256 6cf7d5c2be7793cd65f2d9f5a7c01dfd0e2e76ef587e9130187f8b70fec8f8d1 SHA512 f51c72fa0093c2b17f5ef24401328833b437db5d46e7f6e925ac5d10206ad3c1656515a18417d5405a611126b780565aa84e5009bf5d89c2baff3f890e614423 WHIRLPOOL 74b7c0eb1db8a77a93e162a767addeae25b891a4d7e820f41c440b4193aecaf10ca98116bae695fea337a36208e926ac999108e85a3e61c1fbe193d09603ca3c -AUX nxproxy-3.4.0-no-local-nxcomp-1.patch 951 SHA256 51c2dbfeca919ca84e6fd7b89f87c5b32395107ba7ce71f968583c7e70e39fb0 SHA512 7b29ee2f04cd9931d43be20ad77baa49fd1e3c3b7f59357786cede26bfd3b94ea61d2f199e83f2c42829545cdc1b1a675be5764ae6b28c390dd2c0f42df0759a WHIRLPOOL b82347f53c19ff5b40ac3120f1c03708bc924031ecb08bfca36f80352744097312f1bbd2c0fae964301a30ae267226fb669054cd1fdf16e263fb696d3f9b3f02 -DIST nxproxy-3.4.0-2.tar.gz 80209 SHA256 ecf740db00f2a223f520809f6cf5623d05eb2709e2ea8eadfb9a97b906fabfa6 -EBUILD nxproxy-3.4.0_p2.ebuild 1018 SHA256 7311951687a8314d91332e0ab41cd38e6887c14b08f6c284973d3e92cf3bca8f SHA512 40e02207c3045ed1a7049d294fca9ea7ae6d614e2e648632c11343c44d258b24ba6e9d02913e49768d1ac5ea01e8f49da1d4e9555581cd4904e0a5498d15640a WHIRLPOOL 673a3e1c2f7a275e7b8bbef8636ea8ae5768f750fea96a10bdb19b28e7cd796de490ab8289eedb170831dfe7ad878bd06458b68eb619707f1f7a54dfeb9d614f -MISC ChangeLog 403 SHA256 530e685164565618a4b56403d627607644289e01b981fb00b2462b1eed3d1e93 SHA512 a14762fe97a0c490e27fd6e3b78c37efaf65d5b79940feadb1edf1cdd4638de0b7e67989628a2c2034cfa0a7dc1355d14303db10a7ecdf7819e728dc64a62b40 WHIRLPOOL 3b16e5a0b5798869ade53808b6261b2ac04d82b6efcd402921c5b26d0b70b3b47542992e60a3fff9e34366fc930eeadebaf61a81059fad0539cd089af5ca77d8 -MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9 diff --git a/net-misc/nxproxy/files/nxproxy-3.2.0-read_from_stdin.patch b/net-misc/nxproxy/files/nxproxy-3.2.0-read_from_stdin.patch deleted file mode 100644 index 4cb64703..00000000 --- a/net-misc/nxproxy/files/nxproxy-3.2.0-read_from_stdin.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: nxproxy/Main.c -=================================================================== ---- nxproxy.orig/Main.c 2007-01-19 14:34:34.000000000 -0200 -+++ nxproxy/Main.c 2010-03-27 12:47:28.872040679 -0300 -@@ -36,28 +36,48 @@ - int result = -1; - - char *options = NULL; -- -+ -+ char *nx_commfd_str = NULL; -+ - options = getenv("NX_DISPLAY"); -- -- if (NXTransParseCommandLine(argc, argv) < 0) -+ -+ if ((nx_commfd_str = getenv("NX_COMMFD")) != NULL) - { -- NXTransCleanup(); -- } -+ int nx_commfd = atoi(nx_commfd_str); - -- if (NXTransParseEnvironment(options, 0) < 0) -- { -- NXTransCleanup(); -+ if (result) -+ result = NXTransCreate(nx_commfd, NX_MODE_SERVER, options); -+ -+ // go into endless loop -+ -+ if (result) -+ { -+ while (NXTransRunning(NX_FD_ANY)) -+ result = NXTransContinue(NULL); -+ } - } -+ else -+ { -+ if (NXTransParseCommandLine(argc, argv) < 0) -+ { -+ NXTransCleanup(); -+ } -+ -+ if (NXTransParseEnvironment(options, 0) < 0) -+ { -+ NXTransCleanup(); -+ } -+ -+ /* -+ * This should not return... -+ */ -+ -+ #ifdef TEST -+ fprintf(stderr, "Main: Yielding control to NX entry point.\n"); -+ #endif - -- /* -- * This should not return... -- */ -- -- #ifdef TEST -- fprintf(stderr, "Main: Yielding control to NX entry point.\n"); -- #endif -- -- result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY); -+ result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY); -+ } - - /* - * ...So these should not be called. diff --git a/net-misc/nxproxy/files/nxproxy-3.3.0-cflags.patch b/net-misc/nxproxy/files/nxproxy-3.3.0-cflags.patch deleted file mode 100644 index 30dad5ef..00000000 --- a/net-misc/nxproxy/files/nxproxy-3.3.0-cflags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100 -+++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(Main.c) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CPPFLAGS="-O3" -- - dnl Prefer headers and libraries from nx-X11 if present. - - if test -d "../nx-X11/exports/include" ; then diff --git a/net-misc/nxproxy/files/nxproxy-3.4.0-build_destdir.patch b/net-misc/nxproxy/files/nxproxy-3.4.0-build_destdir.patch deleted file mode 100644 index bcae5e84..00000000 --- a/net-misc/nxproxy/files/nxproxy-3.4.0-build_destdir.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: nxproxy/Makefile.in -=================================================================== ---- nxproxy.orig/Makefile.in 2010-03-27 14:32:09.462039266 -0300 -+++ nxproxy/Makefile.in 2010-03-27 15:18:00.842087362 -0300 -@@ -87,8 +87,8 @@ - install: install.bin install.man - - install.bin: $(PROGRAM) -- $(srcdir)/mkinstalldirs $(bindir) -- $(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) -+ $(INSTALL) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) - - install.man: - $(srcdir)/mkinstalldirs $(man1dir) diff --git a/net-misc/nxproxy/files/nxproxy-3.4.0-no-local-nxcomp-1.patch b/net-misc/nxproxy/files/nxproxy-3.4.0-no-local-nxcomp-1.patch deleted file mode 100644 index 59c148a0..00000000 --- a/net-misc/nxproxy/files/nxproxy-3.4.0-no-local-nxcomp-1.patch +++ /dev/null @@ -1,28 +0,0 @@ -Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com) -Date: 2010-06-14 -Initial Package Version: 3.4.0 -Origin: me -Upstream Status: unknown -Description: search for the lib and the includes location - -diff -Naur nxproxy.orig/Makefile.in nxproxy/Makefile.in ---- nxproxy.orig/Makefile.in 2010-06-14 19:25:40.832707544 +0000 -+++ nxproxy/Makefile.in 2010-06-14 19:27:44.083957268 +0000 -@@ -15,14 +15,14 @@ - -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ - -Wmissing-declarations -Wnested-externs - --CXXINCLUDES = -I. -I../nxcomp -+CXXINCLUDES = -I. -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1 - - CC = @CC@ - CCFLAGS = $(CXXFLAGS) --CCINCLUDES = -I. -I../nxcomp -+CCINCLUDES = -I. -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1 - CCDEFINES = - --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -L/usr/lib/nx/ - LIBS = @LIBS@ - - # diff --git a/net-misc/nxproxy/metadata.xml b/net-misc/nxproxy/metadata.xml deleted file mode 100644 index 46a44e57..00000000 --- a/net-misc/nxproxy/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -no-herd - - @gentoo.org - - - - - diff --git a/net-misc/nxproxy/nxproxy-3.4.0_p2.ebuild b/net-misc/nxproxy/nxproxy-3.4.0_p2.ebuild deleted file mode 100644 index 8fcd62d8..00000000 --- a/net-misc/nxproxy/nxproxy-3.4.0_p2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -MY_P=${P/_p/-} -MY_PV=${PV/_p*/} - -inherit autotools eutils multilib - -DESCRIPTION="NX compression technology core libraries" -HOMEPAGE="http://www.nomachine.com/developers.php" -SRC_URI="http://web04.nomachine.com/download/${MY_PV}/sources/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="!=net-misc/nxcomp-${MY_PV}" - -DEPEND="${RDEPEND}" - -S=${WORKDIR}/nxproxy - -src_prepare() { - # RESPECT cflags - epatch "${FILESDIR}"/nxproxy-3.3.0-cflags.patch - # read from stdin from the x2go nxproxy - epatch "${FILESDIR}"/nxproxy-3.2.0-read_from_stdin.patch - # make isnatll with DESTDIR - epatch "${FILESDIR}"/nxproxy-3.4.0-build_destdir.patch - # non local nxcomp - epatch "${FILESDIR}"/nxproxy-3.4.0-no-local-nxcomp-1.patch - # Run autoreconf in all neeed folders - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" -}