public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/acr38u/
@ 2016-06-12 13:41 Alon Bar-Lev
  0 siblings, 0 replies; 8+ messages in thread
From: Alon Bar-Lev @ 2016-06-12 13:41 UTC (permalink / raw
  To: gentoo-commits

commit:     3c34e1f41b370b280910ec216945ffe06552836e
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 03:21:35 2016 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 03:22:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c34e1f4

app-crypt/acr38u: cleanup

Package-Manager: portage-2.2.28

 app-crypt/acr38u/acr38u-1.7.11-r1.ebuild | 57 --------------------------------
 1 file changed, 57 deletions(-)

diff --git a/app-crypt/acr38u/acr38u-1.7.11-r1.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r1.ebuild
deleted file mode 100644
index 2dcc78f..0000000
--- a/app-crypt/acr38u/acr38u-1.7.11-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit multilib eutils versionator autotools toolchain-funcs udev
-
-MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader"
-
-#SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}.tar.bz2"
-# tarball release is encapsuled in a .zip file :-(
-# http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip
-# I'm waiting an answer from info@acs.com.hk about that !
-SRC_URI="http://www.linuxunderground.be/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.acs.com.hk"
-
-# Make this safe from collisions, require a version of pcsc-lite that
-# uses libusb-1.0 and use the wrapper library instead.
-# Changed back from dev-libs/libusb-compat to virtual/libusb:0 because
-# libusb-compat is marked stable and primary in the virtual. -ssuominen
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
-	virtual/libusb:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-IUSE=""
-
-src_prepare() {
-	epatch_user
-
-	sed -i -e '/pcdir/s:@prefix@/lib:$(libdir):' src/controllib/Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-static=false \
-		--enable-usbdropdir="${D}/usr/$(get_libdir)/readers/usb"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	prune_libtool_files
-
-	# note: for eudev support this pkg may always need to install rules to /usr
-	udev_newrules "${FILESDIR}"/${PV}.rules 92-pcscd-acr38u.rules
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/acr38u/
@ 2017-02-04 20:07 Alon Bar-Lev
  0 siblings, 0 replies; 8+ messages in thread
From: Alon Bar-Lev @ 2017-02-04 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     f8fa2b08fd7b945002b74be6146166493dee2426
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 11:28:29 2017 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 20:06:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8fa2b08

app-crypt/acr38u: eapi bump

Package-Manager: portage-2.3.3

 app-crypt/acr38u/acr38u-1.7.11-r3.ebuild | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
index 4c4104b..ea4ac8d 100644
--- a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit multilib eutils versionator toolchain-funcs udev autotools-utils
+inherit autotools versionator toolchain-funcs udev
 
 MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P
 
@@ -33,11 +33,18 @@ S=${WORKDIR}/${MY_P}
 
 IUSE=""
 
-AUTOTOOLS_AUTORECONF=yes
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_install() {
-	autotools-utils_src_install
+	default
+	prune_libtool_files --modules
 
 	# note: for eudev support this pkg may always need to install rules to /usr
 	udev_newrules "${FILESDIR}"/${PV}-bis.rules 92-pcscd-acr38u.rules


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/acr38u/
@ 2017-03-25 18:11 Alon Bar-Lev
  0 siblings, 0 replies; 8+ messages in thread
From: Alon Bar-Lev @ 2017-03-25 18:11 UTC (permalink / raw
  To: gentoo-commits

commit:     3b9c5f26c25b3cc67a5431e10a3a3889e912f0a5
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 18:09:52 2017 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 18:11:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9c5f26

app-crypt/acr38u: use ltprune

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-crypt/acr38u/acr38u-1.7.11-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
index 85a59d05d44..d403bfbedb5 100644
--- a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools versionator toolchain-funcs udev
+inherit autotools ltprune versionator toolchain-funcs udev
 
 MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/acr38u/
@ 2017-08-22 21:31 Michał Górny
  0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2017-08-22 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     1be8b5fd6e1b69016c0cc95bb20bd88613376f8c
Author:     David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Tue Aug 22 11:37:01 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 21:31:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be8b5fd

app-crypt/acr38u: HOMEPAGE 301 redirect to HTTPS, use HTTPS for SRC_URI

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 app-crypt/acr38u/acr38u-1.7.11-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
index d403bfbedb5..a75e10f43dc 100644
--- a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
@@ -16,8 +16,8 @@ DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader"
 # tarball release is encapsuled in a .zip file :-(
 # http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip
 # I'm waiting an answer from info@acs.com.hk about that !
-SRC_URI="http://www.linuxunderground.be/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.acs.com.hk"
+SRC_URI="https://www.linuxunderground.be/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.acs.com.hk"
 
 # Make this safe from collisions, require a version of pcsc-lite that
 # uses libusb-1.0 and use the wrapper library instead.


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/acr38u/
@ 2018-02-11 10:01 Michał Górny
  0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2018-02-11 10:01 UTC (permalink / raw
  To: gentoo-commits

commit:     e99cd18195e8c34f2660b08e39993018e5333b73
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 09:55:04 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 10:01:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e99cd181

app-crypt/acr38u: Remove useless maintainer <description/>

Remove useless/redundant maintainer <description/>. It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 app-crypt/acr38u/metadata.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-crypt/acr38u/metadata.xml b/app-crypt/acr38u/metadata.xml
index 8dbe56e40ef..b7f98870cc2 100644
--- a/app-crypt/acr38u/metadata.xml
+++ b/app-crypt/acr38u/metadata.xml
@@ -3,13 +3,12 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>vincent.hardy.be@gmail.com</email>
-    <description>Proxied maintainer, assign bugs to him</description>
   </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>crypto@gentoo.org</email>
     <name>Crypto</name>
   </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/acr38u/
@ 2022-07-06 17:19 Amy Liffey
  0 siblings, 0 replies; 8+ messages in thread
From: Amy Liffey @ 2022-07-06 17:19 UTC (permalink / raw
  To: gentoo-commits

commit:     226b13f9d283269dab5641890ff0e7145ea55975
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 17:18:29 2022 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 17:18:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=226b13f9

app-crypt/acr38u: udev rules without calling udev_reload

Closes: https://bugs.gentoo.org/854234
Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>

 app-crypt/acr38u/acr38u-1.7.11-r4.ebuild | 56 ++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
new file mode 100644
index 000000000000..2af122979701
--- /dev/null
+++ b/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs udev
+
+MY_P=ACR38_LINUX_$(ver_cut 1)00$(ver_cut 2)$(ver_cut 3)_P
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader"
+
+#SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}.tar.bz2"
+# tarball release is encapsuled in a .zip file :-(
+# http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip
+# This drivers is not maintained by ACS anymore.
+SRC_URI="https://www.linuxunderground.be/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.acs.com.hk"
+
+# Make this safe from collisions, require a version of pcsc-lite that
+# uses libusb-1.0 and use the wrapper library instead.
+# Changed back from dev-libs/libusb-compat to virtual/libusb:0 because
+# libusb-compat is marked stable and primary in the virtual. -ssuominen
+RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+	virtual/libusb:0"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	# note: for eudev support this pkg may always need to install rules to /usr
+	udev_newrules "${FILESDIR}/${PV}-bis.rules" 92-pcscd-acr38u.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/acr38u/
@ 2022-07-08  7:28 Amy Liffey
  0 siblings, 0 replies; 8+ messages in thread
From: Amy Liffey @ 2022-07-08  7:28 UTC (permalink / raw
  To: gentoo-commits

commit:     52d01e33f0917cbf9382580ff151f10fd4002d26
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 07:27:22 2022 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 07:27:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52d01e33

app-crypt/acr38u: remove old

Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>

 app-crypt/acr38u/acr38u-1.7.11-r3.ebuild | 48 --------------------------------
 1 file changed, 48 deletions(-)

diff --git a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
deleted file mode 100644
index db32da26fb14..000000000000
--- a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs udev
-
-MY_P=ACR38_LINUX_$(ver_cut 1)00$(ver_cut 2)$(ver_cut 3)_P
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader"
-
-#SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}.tar.bz2"
-# tarball release is encapsuled in a .zip file :-(
-# http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip
-# I'm waiting an answer from info@acs.com.hk about that !
-SRC_URI="https://www.linuxunderground.be/${MY_P}.tar.bz2"
-HOMEPAGE="https://www.acs.com.hk"
-
-# Make this safe from collisions, require a version of pcsc-lite that
-# uses libusb-1.0 and use the wrapper library instead.
-# Changed back from dev-libs/libusb-compat to virtual/libusb:0 because
-# libusb-compat is marked stable and primary in the virtual. -ssuominen
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
-	virtual/libusb:0"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	# note: for eudev support this pkg may always need to install rules to /usr
-	udev_newrules "${FILESDIR}/${PV}-bis.rules" 92-pcscd-acr38u.rules
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/acr38u/
@ 2023-09-09 13:17 David Seifert
  0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2023-09-09 13:17 UTC (permalink / raw
  To: gentoo-commits

commit:     b0080b0401371a9ac60e3a680957d4ec4e2887e2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  9 13:16:38 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep  9 13:16:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0080b04

app-crypt/acr38u: remove unused eclass 'toolchain-funcs'

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-crypt/acr38u/acr38u-1.7.11-r4.ebuild | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
index 2af122979701..285b807fbd33 100644
--- a/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
@@ -1,38 +1,36 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools toolchain-funcs udev
+inherit autotools udev
 
-MY_P=ACR38_LINUX_$(ver_cut 1)00$(ver_cut 2)$(ver_cut 3)_P
+MY_P="ACR38_LINUX_$(ver_cut 1)00$(ver_cut 2)$(ver_cut 3)_P"
 
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader"
-
 #SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}.tar.bz2"
 # tarball release is encapsuled in a .zip file :-(
 # http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip
-# This drivers is not maintained by ACS anymore.
+# This driver is not maintained by ACS anymore.
 SRC_URI="https://www.linuxunderground.be/${MY_P}.tar.bz2"
 HOMEPAGE="https://www.acs.com.hk"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 # Make this safe from collisions, require a version of pcsc-lite that
 # uses libusb-1.0 and use the wrapper library instead.
 # Changed back from dev-libs/libusb-compat to virtual/libusb:0 because
 # libusb-compat is marked stable and primary in the virtual. -ssuominen
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+RDEPEND="
+	>=sys-apps/pcsc-lite-1.6.4
 	virtual/libusb:0"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
 
 src_prepare() {
 	default
@@ -41,7 +39,7 @@ src_prepare() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	# note: for eudev support this pkg may always need to install rules to /usr
 	udev_newrules "${FILESDIR}/${PV}-bis.rules" 92-pcscd-acr38u.rules


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2023-09-09 13:17 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-11 10:01 [gentoo-commits] repo/gentoo:master commit in: app-crypt/acr38u/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2023-09-09 13:17 David Seifert
2022-07-08  7:28 Amy Liffey
2022-07-06 17:19 Amy Liffey
2017-08-22 21:31 Michał Górny
2017-03-25 18:11 Alon Bar-Lev
2017-02-04 20:07 Alon Bar-Lev
2016-06-12 13:41 Alon Bar-Lev

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