[gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/
Date: Sun, 20 Aug 2017 19:48:55 +0000 (UTC)	[thread overview]
Message-ID: <1503258522.080ee7087ff8e8ce4b53d36294b5f657381c9e59.graaff@gentoo> (raw)

commit:     080ee7087ff8e8ce4b53d36294b5f657381c9e59
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 19:47:59 2017 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 19:48:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=080ee708

net-wireless/lorcon: drop ruby USE flag, bug 620400

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-wireless/lorcon/lorcon-0.0_p20150109.ebuild | 35 +++----------------------
 net-wireless/lorcon/lorcon-9999.ebuild          | 35 +++----------------------
 2 files changed, 8 insertions(+), 62 deletions(-)

diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
index a77f0e64a77..c10482d2cdf 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,10 +6,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-USE_RUBY="ruby20 ruby21"
-RUBY_OPTIONAL=yes
-
-inherit distutils-r1 ruby-ng
+inherit distutils-r1
 
 DESCRIPTION="A generic library for injecting 802.11 frames"
 HOMEPAGE="http://802.11ninja.net/lorcon"
@@ -25,9 +22,9 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="python ruby"
+IUSE="python"
 
-DEPEND="ruby? ( $(ruby_implementations_depend) )
+DEPEND="
 	python? ( ${PYTHON_DEPS} )
 	dev-libs/libnl:3=
 	net-libs/libpcap"
@@ -37,26 +34,17 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}"/${P}
 
-pkg_setup() {
-	use ruby && ruby-ng_pkg_setup
-}
-
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
 		git-r3_src_unpack
 		cp -R "${S}/" "${WORKDIR}/all"
 	fi
 	default_src_unpack
-	#ruby-ng_src_unpack doesn't seem to like mixing with git so we just copy things above
-	use ruby && ruby-ng_src_unpack
 }
 
 src_prepare() {
 	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#find_library("orcon2", "lorcon_list_drivers", "lorcon2/lorcon.h") and ##' ruby-lorcon/extconf.rb
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
 	use python && distutils-r1_src_prepare
-	use ruby && ruby-ng_src_prepare
 }
 
 src_configure() {
@@ -65,7 +53,6 @@ src_configure() {
 
 src_compile() {
 	default_src_compile
-	use ruby && ruby-ng_src_compile
 	if use python; then
 		LDFLAGS+=" -L${S}/.libs/"
 		cd pylorcon2 || die
@@ -75,7 +62,6 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${ED}" install
-	use ruby && ruby-ng_src_install
 	if use python; then
 		cd pylorcon2 || die
 		distutils-r1_src_install
@@ -85,16 +71,3 @@ src_install() {
 src_test() {
 	:
 }
-
-each_ruby_compile() {
-	sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/${P}/ruby-lorcon -L${WORKDIR}/${P}/.libs#" ruby-lorcon/extconf.rb
-	"${RUBY}" -C ruby-lorcon extconf.rb || die
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
-	sed -i -e "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" \
-		-e "s#-Wl,--no-undefined##" ruby-lorcon/Makefile || die
-	emake V=1 -C ruby-lorcon
-}
-
-each_ruby_install() {
-	DESTDIR="${ED}" emake -C ruby-lorcon install
-}

diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index c25009b8693..f0502097ecd 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,10 +6,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-USE_RUBY="ruby20 ruby21"
-RUBY_OPTIONAL=yes
-
-inherit distutils-r1 ruby-ng
+inherit distutils-r1
 
 DESCRIPTION="A generic library for injecting 802.11 frames"
 HOMEPAGE="http://802.11ninja.net/lorcon"
@@ -25,9 +22,9 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="python ruby"
+IUSE="python"
 
-DEPEND="ruby? ( $(ruby_implementations_depend) )
+DEPEND="
 	python? ( ${PYTHON_DEPS} )
 	dev-libs/libnl:3=
 	net-libs/libpcap"
@@ -37,26 +34,17 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}"/${P}
 
-pkg_setup() {
-	use ruby && ruby-ng_pkg_setup
-}
-
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
 		git-r3_src_unpack
 		cp -R "${S}/" "${WORKDIR}/all"
 	fi
 	default_src_unpack
-	#ruby-ng_src_unpack doesn't seem to like mixing with git so we just copy things above
-	use ruby && ruby-ng_src_unpack
 }
 
 src_prepare() {
 	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#find_library("orcon2", "lorcon_list_drivers", "lorcon2/lorcon.h") and ##' ruby-lorcon/extconf.rb
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
 	use python && distutils-r1_src_prepare
-	use ruby && ruby-ng_src_prepare
 }
 
 src_configure() {
@@ -65,7 +53,6 @@ src_configure() {
 
 src_compile() {
 	default_src_compile
-	use ruby && ruby-ng_src_compile
 	if use python; then
 		LDFLAGS+=" -L${S}/.libs/"
 		cd pylorcon2 || die
@@ -75,7 +62,6 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${ED}" install
-	use ruby && ruby-ng_src_install
 	if use python; then
 		cd pylorcon2 || die
 		distutils-r1_src_install
@@ -85,16 +71,3 @@ src_install() {
 src_test() {
 	:
 }
-
-each_ruby_compile() {
-	sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/${P}/ruby-lorcon -L${WORKDIR}/${P}/.libs#" ruby-lorcon/extconf.rb
-	"${RUBY}" -C ruby-lorcon extconf.rb || die
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
-	sed -i -e "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" \
-		-e "s#-Wl,--no-undefined##" ruby-lorcon/Makefile || die
-	emake V=1 -C ruby-lorcon
-}
-
-each_ruby_install() {
-	DESTDIR="${ED}" emake -C ruby-lorcon install
-}

next             reply	other threads:[~2017-08-20 19:48 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-20 19:48 Hans de Graaff [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-08-19 13:41 [gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/ Rick Farina
2023-08-19 13:41 Rick Farina
2023-08-19 13:41 Rick Farina
2023-04-19 10:16 Arthur Zamarin
2023-04-19 10:16 Arthur Zamarin
2023-04-19  9:46 Sam James
2023-04-19  9:43 Sam James
2023-03-19 17:14 David Seifert
2023-03-19 17:14 David Seifert
2022-04-07 14:46 Rick Farina
2022-02-16 16:08 Rick Farina
2022-02-16 16:08 Rick Farina
2022-01-13  1:53 Rick Farina
2022-01-13  1:53 Rick Farina
2021-02-17 16:10 Rick Farina
2021-02-17 15:34 Rick Farina
2020-11-14 20:22 David Seifert
2020-11-08  0:32 Michał Górny
2020-10-03 14:57 Sam James
2020-10-01 23:06 Sergei Trofimovich
2020-02-14 19:40 Rick Farina
2019-05-19 22:33 Stephen Klimaszewski
2018-07-06 14:33 Richard Farina
2018-07-06 14:27 Richard Farina
2018-07-05 18:28 Richard Farina
2018-07-05 18:28 Richard Farina
2017-10-04  9:15 Michał Górny
2016-11-06 15:25 Hans de Graaff
2016-07-22  7:05 Hans de Graaff
2015-09-07  9:55 Manuel Rüger
2015-09-07  9:50 Agostino Sarubbo
2015-08-31 18:52 Richard Farina
2015-08-31 17:09 Richard Farina

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:a77f0e64a7 dfblob:c10482d2cd dfblob:c25009b869
dfblob:f0502097ec )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1503258522.080ee7087ff8e8ce4b53d36294b5f657381c9e59.graaff@gentoo \
    --to=graaff@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox