summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina <zerochaos@gentoo.org>2013-01-26 00:09:50 +0000
committerRick Farina <zerochaos@gentoo.org>2013-01-26 00:09:50 +0000
commited55faec3e1edb538b8bf2843c0c7b2e6ed16c94 (patch)
treeea1a394bc99f7e388e389d5c2f321fc3a8b6db04 /net-wireless
parentadded ~arm tested by me (diff)
downloadgentoo-2-ed55faec3e1edb538b8bf2843c0c7b2e6ed16c94.tar.gz
gentoo-2-ed55faec3e1edb538b8bf2843c0c7b2e6ed16c94.tar.bz2
gentoo-2-ed55faec3e1edb538b8bf2843c0c7b2e6ed16c94.zip
remove old unneeded ebuilds
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/wireless-tools/ChangeLog7
-rw-r--r--net-wireless/wireless-tools/files/wireless-tools-29-inline-fix.patch119
-rw-r--r--net-wireless/wireless-tools/wireless-tools-29-r1.ebuild73
-rw-r--r--net-wireless/wireless-tools/wireless-tools-29.ebuild71
4 files changed, 6 insertions, 264 deletions
diff --git a/net-wireless/wireless-tools/ChangeLog b/net-wireless/wireless-tools/ChangeLog
index 7b3d1d8b0ceb..06f046f8528f 100644
--- a/net-wireless/wireless-tools/ChangeLog
+++ b/net-wireless/wireless-tools/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-wireless/wireless-tools
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.153 2013/01/05 13:25:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.154 2013/01/26 00:09:50 zerochaos Exp $
+
+ 26 Jan 2013; Rick Farina <zerochaos@gentoo.org>
+ -files/wireless-tools-29-inline-fix.patch, -wireless-tools-29-r1.ebuild,
+ -wireless-tools-29.ebuild:
+ remove old unneeded ebuilds
05 Jan 2013; Raúl Porcel <armin76@gentoo.org> wireless-tools-30_pre9.ebuild:
sh stable wrt #445292
diff --git a/net-wireless/wireless-tools/files/wireless-tools-29-inline-fix.patch b/net-wireless/wireless-tools/files/wireless-tools-29-inline-fix.patch
deleted file mode 100644
index 9e00280086d4..000000000000
--- a/net-wireless/wireless-tools/files/wireless-tools-29-inline-fix.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- wireless_tools.29.orig/iwlib.h 2011-03-05 16:36:55.000000000 -0500
-+++ wireless_tools.29/iwlib.h 2011-03-05 16:41:32.000000000 -0500
-@@ -60,36 +60,6 @@
- /* Private copy of Wireless extensions (in this directoty) */
- #include "wireless.h"
-
--/* Make gcc understant that when we say inline, we mean it.
-- * I really hate when the compiler is trying to be more clever than me,
-- * because in this case gcc is not able to figure out functions with a
-- * single call site, so not only I have to tag those functions inline
-- * by hand, but then it refuse to inline them properly.
-- * Total saving for iwevent : 150B = 0.7%.
-- * Fortunately, in gcc 3.4, they now automatically inline static functions
-- * with a single call site. Hurrah !
-- * Jean II */
--#undef IW_GCC_HAS_BROKEN_INLINE
--#if __GNUC__ == 3
--#if __GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 4
--#define IW_GCC_HAS_BROKEN_INLINE 1
--#endif /* __GNUC_MINOR__ */
--#endif /* __GNUC__ */
--/* However, gcc 4.0 has introduce a new "feature", when compiling with
-- * '-Os', it does not want to inline iw_ether_cmp() and friends.
-- * So, we need to fix inline again !
-- * Jean II */
--#if __GNUC__ == 4
--#define IW_GCC_HAS_BROKEN_INLINE 1
--#endif /* __GNUC__ */
--/* Now, really fix the inline */
--#ifdef IW_GCC_HAS_BROKEN_INLINE
--#ifdef inline
--#undef inline
--#endif /* inline */
--#define inline inline __attribute__((always_inline))
--#endif /* IW_GCC_HAS_BROKEN_INLINE */
--
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -491,6 +461,7 @@
- /************************* INLINE FUNTIONS *************************/
- /*
- * Functions that are so simple that it's more efficient inlining them
-+ * Most inline are private because gcc is fussy about inline...
- */
-
- /*
-@@ -502,7 +473,7 @@
- /*
- * Wrapper to push some Wireless Parameter in the driver
- */
--static inline int
-+static inline __attribute__((always_inline)) int
- iw_set_ext(int skfd, /* Socket to the kernel */
- const char * ifname, /* Device name */
- int request, /* WE ID */
-@@ -518,7 +489,7 @@
- /*
- * Wrapper to extract some Wireless Parameter out of the driver
- */
--static inline int
-+static inline __attribute__((always_inline)) int
- iw_get_ext(int skfd, /* Socket to the kernel */
- const char * ifname, /* Device name */
- int request, /* WE ID */
-@@ -534,7 +505,7 @@
- /*
- * Close the socket used for ioctl.
- */
--static inline void
-+static inline __attribute__((always_inline)) void
- iw_sockets_close(int skfd)
- {
- close(skfd);
-@@ -544,7 +515,7 @@
- /*
- * Display an Ethernet Socket Address in readable format.
- */
--static inline char *
-+static inline __attribute__((always_inline)) char *
- iw_saether_ntop(const struct sockaddr *sap, char* bufp)
- {
- iw_ether_ntop((const struct ether_addr *) sap->sa_data, bufp);
-@@ -554,7 +525,7 @@
- /*
- * Input an Ethernet Socket Address and convert to binary.
- */
--static inline int
-+static inline __attribute__((always_inline)) int
- iw_saether_aton(const char *bufp, struct sockaddr *sap)
- {
- sap->sa_family = ARPHRD_ETHER;
-@@ -565,7 +536,7 @@
- /*
- * Create an Ethernet broadcast address
- */
--static inline void
-+static inline __attribute__((always_inline)) void
- iw_broad_ether(struct sockaddr *sap)
- {
- sap->sa_family = ARPHRD_ETHER;
-@@ -576,7 +547,7 @@
- /*
- * Create an Ethernet NULL address
- */
--static inline void
-+static inline __attribute__((always_inline)) void
- iw_null_ether(struct sockaddr *sap)
- {
- sap->sa_family = ARPHRD_ETHER;
-@@ -587,7 +558,7 @@
- /*
- * Compare two ethernet addresses
- */
--static inline int
-+static inline __attribute__((always_inline)) int
- iw_ether_cmp(const struct ether_addr* eth1, const struct ether_addr* eth2)
- {
- return memcmp(eth1, eth2, sizeof(*eth1));
diff --git a/net-wireless/wireless-tools/wireless-tools-29-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-29-r1.ebuild
deleted file mode 100644
index 0102f32d8063..000000000000
--- a/net-wireless/wireless-tools/wireless-tools-29-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-29-r1.ebuild,v 1.2 2011/04/11 04:08:48 josejx Exp $
-
-inherit toolchain-funcs multilib eutils
-
-# The following works with both pre-releases and releases
-MY_P=${PN/-/_}.${PV/_/.}
-S=${WORKDIR}/${MY_P/\.pre*/}
-
-DESCRIPTION="A collection of tools to configure IEEE 802.11 wireless LAN cards"
-HOMEPAGE="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="multicall nls"
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
-
- epatch "${FILESDIR}/${P}-asneeded.patch"
-
- sed -i \
- -e "s:^\(CC\) = gcc:\1 = $(tc-getCC):" \
- -e "s:^\(AR\) = ar:\1 = $(tc-getAR):" \
- -e "s:^\(RANLIB\) = ranlib:\1 = $(tc-getRANLIB):" \
- -e "s:^\(CFLAGS=-Os\):#\1:" \
- -e "s:\(@\$(LDCONFIG).*\):#\1:" \
- -e "s:^\(INSTALL_MAN= \$(PREFIX)\)/man/:\1/share/man:" \
- -e "s:^\(INSTALL_LIB= \$(PREFIX)\)/lib/:\1/$(get_libdir)/:" \
- -e '/\$(CC)/s:-Wl,-s\>::' \
- "${S}"/Makefile || die
-
- epatch "${FILESDIR}/${P}-inline-fix.patch"
-}
-
-src_compile() {
- emake || die "emake failed"
-
- if use multicall; then
- emake iwmulticall || die "emake iwmulticall failed"
- fi
-}
-
-src_install() {
- make PREFIX="${D}" INSTALL_INC="${D}"/usr/include INSTALL_MAN="${D}"/usr/share/man install \
- || die "make install failed"
-
- if use multicall; then
- # 'make install-iwmulticall' will overwrite some of the tools
- # with symlinks - this is intentional (brix)
- make PREFIX="${D}" INSTALL_INC="${D}"/usr/include INSTALL_MAN="${D}"/usr/share/man install-iwmulticall \
- || die "make install-iwmulticall failed"
- fi
-
- if use nls; then
- for lang in fr cs; do
- for man in 5 7 8; do
- insinto /usr/share/man/${lang}/man${man}
- doins ${lang}/*.${man}
- done
-
- [[ -f README.${lang} ]] && dodoc README.${lang}
- done
- fi
-
- dodoc CHANGELOG.h DISTRIBUTIONS.txt HOTPLUG.txt IFRENAME-VS-XXX.txt PCMCIA.txt README
-}
diff --git a/net-wireless/wireless-tools/wireless-tools-29.ebuild b/net-wireless/wireless-tools/wireless-tools-29.ebuild
deleted file mode 100644
index d8da7ed21dd4..000000000000
--- a/net-wireless/wireless-tools/wireless-tools-29.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-29.ebuild,v 1.12 2009/09/12 23:30:12 flameeyes Exp $
-
-inherit toolchain-funcs multilib eutils
-
-# The following works with both pre-releases and releases
-MY_P=${PN/-/_}.${PV/_/.}
-S=${WORKDIR}/${MY_P/\.pre*/}
-
-DESCRIPTION="A collection of tools to configure IEEE 802.11 wireless LAN cards"
-HOMEPAGE="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sh ~sparc x86"
-IUSE="multicall nls"
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
-
- epatch "${FILESDIR}/${P}-asneeded.patch"
-
- sed -i \
- -e "s:^\(CC\) = gcc:\1 = $(tc-getCC):" \
- -e "s:^\(AR\) = ar:\1 = $(tc-getAR):" \
- -e "s:^\(RANLIB\) = ranlib:\1 = $(tc-getRANLIB):" \
- -e "s:^\(CFLAGS=-Os\):#\1:" \
- -e "s:\(@\$(LDCONFIG).*\):#\1:" \
- -e "s:^\(INSTALL_MAN= \$(PREFIX)\)/man/:\1/share/man:" \
- -e "s:^\(INSTALL_LIB= \$(PREFIX)\)/lib/:\1/$(get_libdir)/:" \
- -e '/\$(CC)/s:-Wl,-s\>::' \
- "${S}"/Makefile || die
-}
-
-src_compile() {
- emake || die "emake failed"
-
- if use multicall; then
- emake iwmulticall || die "emake iwmulticall failed"
- fi
-}
-
-src_install() {
- make PREFIX="${D}" INSTALL_INC="${D}"/usr/include INSTALL_MAN="${D}"/usr/share/man install \
- || die "make install failed"
-
- if use multicall; then
- # 'make install-iwmulticall' will overwrite some of the tools
- # with symlinks - this is intentional (brix)
- make PREFIX="${D}" INSTALL_INC="${D}"/usr/include INSTALL_MAN="${D}"/usr/share/man install-iwmulticall \
- || die "make install-iwmulticall failed"
- fi
-
- if use nls; then
- for lang in fr cs; do
- for man in 5 7 8; do
- insinto /usr/share/man/${lang}/man${man}
- doins ${lang}/*.${man}
- done
-
- [[ -f README.${lang} ]] && dodoc README.${lang}
- done
- fi
-
- dodoc CHANGELOG.h DISTRIBUTIONS.txt HOTPLUG.txt IFRENAME-VS-XXX.txt PCMCIA.txt README
-}