ohnobinki_overlay Changeset - 3b9c9177a50b

Changeset - 3b9c9177a50b

Parent rev.

Child rev.

[Not reviewed]

default

3 7 0

Nathan Brink (binki) - 16 years ago 2009-05-10 01:01:30
ohnobinki@ohnopublishing.net

dev-embedded/phidget: Removed old versions and patch, fixed ebuild syntax, commented on each patch's function.

10 files changed with 78 insertions and 210 deletions:

dev-embedded/phidget/ChangeLog

dev-embedded/phidget/Manifest

dev-embedded/phidget/files/phidget21-2.1.5.20090105-crosscompile.patch

dev-embedded/phidget/files/phidget21-crosscompile.patch

dev-embedded/phidget/files/phidget21-java.patch

dev-embedded/phidget/files/phidget21-libdir.patch

dev-embedded/phidget/phidget-2.1.4.20080924.ebuild

dev-embedded/phidget/phidget-2.1.5.20081023.ebuild

dev-embedded/phidget/phidget-2.1.5.20090105.ebuild

dev-embedded/phidget/phidget-2.1.6.20090430.ebuild

0 comments (0 inline, 0 general)

dev-embedded/phidget/ChangeLog

➞

Show inline comments

 # ChangeLog for dev-embedded/phidget
 # Copyright 1999-2009 Nathan Brink; Distributed under the GPL v2
 # $Header: $
 May 2009; Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
   files/phidget21-crosscompile.patch, -phidget-2.1.4.20080924.ebuild,
   files/phidget21-java.patch, -phidget-2.1.5.20081023.ebuild,
   files/phidget21-libdir.patch, phidget-2.1.5.20090105.ebuild,
   -files/phidget21-2.1.5.20090105-crosscompile.patch,
   phidget-2.1.6.20090430.ebuild:
   Removed old versions and patch, fixed ebuild syntax, commented on each
   patch's function.
 *phidget-2.1.5.20090430 (09 April 2009)
 May 2009; Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
   phidget-2.1.4.20080924.ebuild, phidget-2.1.5.20081023.ebuild,
   phidget-2.1.5.20090105.ebuild, +phidget-2.1.6.20090430.ebuild, +metadata.xml:
   Version bump, added metadata.xml, fixed ChangeLog somewhat, fixed licenses, added IUSE,
   added quoting.
 Jan 2009; Nathan Phillip Brink <ohnobinki@ohnopublishing.net> +phidget-2.1.5.20090105.ebuild, +files/phidget21-2.1.5.20090105-crosscompile.patch, phidget-2.1.4.20080924.ebuild, phidget-2.1.5.20081023.ebuild
   Bumped to new version - needed to create a new files/phidget-crosscompile.patch for this version because the Makefile changed.
   Updated logic in the all of the ebuilds - they are all identical except for which patches are referenced. Fixed references to things like make=>emake and calling java stuff when the java use-flag was disabled

dev-embedded/phidget/Manifest

➞

Show inline comments

 AUX phidget21-2.1.5.20090105-crosscompile.patch 777 RMD160 03f57998134858f836199eae68de8548e403c41d SHA1 0306406dfe52098c9147a18d98643424cd72bfaa SHA256 9f7a89a6a47a9e53cb281d667d74fca60f33b98d61e04d37e1b652590cd47a6a
 AUX phidget21-crosscompile.patch 709 RMD160 28c7fc6f7f9b4717ca85c81afa317a156d01b3f4 SHA1 e12db1b12b4357304141264e4fb6128d9de92172 SHA256 e8c4cd0e591da58ee47f1bf7fe7026b2ecbe7bae90fdb7c6681d780341ec6089
 AUX phidget21-java.patch 785 RMD160 956f5913c5ca75e120de97796d2e6ac07b5f85be SHA1 4c44ef073ef75c70cd2b05892e0161930df0c21d SHA256 045ea70c94fe3a3f0e3b92b295ae643a20ee7e378cae1258ee1d14a7c2f8cb2f
 AUX phidget21-libdir.patch 562 RMD160 b4d98da1326708f13ec19a938c64e829431b975a SHA1 bbc770a37506753ce1c8cd5256c337db6ed64ac1 SHA256 12d90ad6ea8d4ca2faa0d533e321847241620d4cc4d624e816c4e69a22e6c726
 DIST Phidgetlinux_2.1.4.20080924.tar.gz 292176 RMD160 2360bc2ccc14d2afd30de11386eac3f4e3399cf0 SHA1 a296abee3f48d8126b521b10e487cd77fe07051d SHA256 7f60fc29147b45bbe0fa6cca769bf8a940839b13b8786bdfbca18bb54822cb25
 DIST Phidgetlinux_2.1.5.20081023.tar.gz 304986 RMD160 08819880bbf364cbf388c826f2dd8b4c3dba5933 SHA1 3f1e0ad9b610968ee0539093be76ff539cc66210 SHA256 a03c0c46fa2901cc536492933da30711f522cb9776fd15b3e556f3cba2cdd709
 AUX phidget21-crosscompile.patch 697 RMD160 74eb677dba2abe1706ebec408e708cf58207ae96 SHA1 8f0b9e5af45d46c441e9cddd4aa88bf541ce1d92 SHA256 af9411cb24c63e380ab1a7b9a033ffabc25461fe349ee115a9a2536b4e5777ad
 AUX phidget21-java.patch 716 RMD160 7fd30e15aa9b89d7395c74cbf8b413f2aabff795 SHA1 8c541296b63e4e4e0a42d576af14517275aeceab SHA256 8274b80b18ba4a90e233088d6c963e0e2c31ae9a98022e1cff68be1e08673109
 AUX phidget21-libdir.patch 559 RMD160 133c0473c42003e00d90e2c60af5e94dd91d8b09 SHA1 fd5a67307f08a8ca1f9b751114d0bc3aff3daae5 SHA256 f17604ededb52a5dd1ef4e71c25d8ccb09bb5ecb15bee1b9c0cc38ce19e01072
 DIST Phidgetlinux_2.1.5.20090105.tar.gz 316490 RMD160 0c0088eee842b7b4b723867c08964557c665b9aa SHA1 484fa7c170e412e9513d5f08e883a5efd9a7c366 SHA256 bfaaaf2aa21c854b2f0305ed6b55605d336b6b890eedf40ead0e17b419b7ac33
 DIST Phidgetlinux_2.1.6.20090430.tar.gz 342985 RMD160 a45e335c4672e918152537cd771bcd4b21a85ddf SHA1 60fadd7ba15342b2ad6c58b19d659532fe963513 SHA256 b1cf06ecae292c2b201c30878fa2e89c2251d8a0b994a9227870a7ce52dc2605
 EBUILD phidget-2.1.4.20080924.ebuild 1510 RMD160 a19a62cf9f03c416e6787270fc4c25bc44a9a7ec SHA1 8223b73f26000e64f4e0b28f9f8189ff97feceaa SHA256 f647046a41f92842379e71c8a143cd4edf534f46497d9273a3e89af85ea01d91
 EBUILD phidget-2.1.5.20081023.ebuild 1510 RMD160 a19a62cf9f03c416e6787270fc4c25bc44a9a7ec SHA1 8223b73f26000e64f4e0b28f9f8189ff97feceaa SHA256 f647046a41f92842379e71c8a143cd4edf534f46497d9273a3e89af85ea01d91
 EBUILD phidget-2.1.5.20090105.ebuild 1575 RMD160 cad1cb9fc310230e9c5edc3cc213e1ae18d2fca3 SHA1 0441ce28ede42e144d08db391c7549bc0ea380dd SHA256 39b63bc6d6cdba4a2385b9c6f720b872da31ab48caaac4652ce8eb7d518cee70
 EBUILD phidget-2.1.6.20090430.ebuild 1575 RMD160 289969ba6d709236b795ac6f82580a24a5df8bfa SHA1 a74a256a4ee037d7e8521d5cc259146582f9a6ca SHA256 13a0eff5276cd0ebf02a104fd87115be9649303624e0e55a98994235c2938577
 MISC ChangeLog 1567 RMD160 2c861aca09692ed41d2cf0773d046c5601bed2ad SHA1 c34160374bcfec7f9c4f91f593df59eef5d978b0 SHA256 967e1f46198c208644ce618c7b1c968b44511351a706137a14f2fa81f1cc1fb3
 EBUILD phidget-2.1.5.20090105.ebuild 1466 RMD160 404226e7acfc5501f73fd0e71fbeb641aa080bcf SHA1 0637327cba23c81dccff3d1141f4d6b3f3737d3c SHA256 99cbe1caecc5f99920000adb77aacc558f6a3ec93e03910c9c662e72537a3e31
 EBUILD phidget-2.1.6.20090430.ebuild 1505 RMD160 fc29337e0c53566b47ef58cf0bb07a0f9b3514b3 SHA1 482a580774b068d4324b9eeae0cebe8fd1384510 SHA256 a672bd26ca4da0b97e03eaa59374e6470419be2eb2b70ed802d4a6a3ab711f83
 MISC ChangeLog 2010 RMD160 54122ec6a26de1462ca76f67d47c85c2c94a4747 SHA1 6900303fa1ea3c1aff19951ab0fb3cbb932c88c9 SHA256 eb06142e3fc0178b472ddb989e5aa86d5f82ac370b6321384a892ad20e7724d7
 MISC metadata.xml 159 RMD160 f10ed331bd974e86e8c4596a8a52e300f40aec97 SHA1 84133adb2dda5a115dd082b76b119516e3154cef SHA256 8d195cad36f7f93232fa3b2523bd2f55d5ff84e843087433aa12cbb9af40e3ce

dev-embedded/phidget/files/phidget21-2.1.5.20090105-crosscompile.patch

➞

Show inline comments

deleted file

dev-embedded/phidget/files/phidget21-crosscompile.patch

➞

Show inline comments

 diff -c /home/ohnobinki/ivd/phidgetprogs/phidgetlinux/Phidgetlinux/phidget21/Makefile /tmp/buffer-content-3770Mkg
 --- Makefile	Mon Sep 22 14:48:19 2008
 +++ Makefile	Tue Sep 30 07:10:04 2008
@@ -2,17 +2,17 @@
 Allow cross-compilation uclibc/busybox-style.
 --- /Phidgetlinux/phidget21/Makefile	2009-01-06 17:20:07.000000000 -0500
 +++ /Phidgetlinux/phidget21/Makefile	2009-01-06 17:46:57.000000000 -0500
@@ -2,18 +2,16 @@
  DEBUG?=n
  DMALLOC?=n
  JAVA?=y
 -CROSSCOMPILE?=n
 +CROSS_COMPILE?=
  ZEROCONF?=avahi
  ZEROCONF_LOOKUP?=n
 -ifeq ($(CROSSCOMPILE),y)
 -CC=arm-linux-gcc
 -NM=arm-linux-nm
 -AR=arm-linux-ar
 -CXX=arm-linux-g++
 -CPP=arm-linux-cpp
 -LD=arm-linux-ld
 -endif
 +#ifeq ($(CROSSCOMPILE),y)
 +CC=$(CROSS_COMPILE)gcc
 +NM=$(CROSS_COMPILE)nm
 +AR=$(CROSS_COMPILE)ar
 +CXX=$(CROSS_COMPILE)g++
 +CPP=$(CROSS_COMPILE)cpp
 +LD=$(CROSS_COMPILE)ld
 +#endif
  ifeq ($(JAVA),y)
  JAVAHOME := /usr/java/j2sdk1.4.2_18
-Diff finished.  Tue Sep 30 07:10:05 2008
+Diff finished.  Tue Jan  6 17:46:57 2009

dev-embedded/phidget/files/phidget21-java.patch

➞

Show inline comments

 diff -u /home/ohnobinki/ivd/phidgetprogs/phidgetlinux/Phidgetlinux/phidget21/Makefile /tmp/buffer-content-3770FHU
 Allows the ebuild to specify java variables
 --- Makefile	Tue Sep 30 07:24:27 2008
 +++ Makefile	Tue Sep 30 07:28:44 2008
@@ -1,8 +1,9 @@
  PREFIX=/usr
  DEBUG?=n
  DMALLOC?=n
 -JAVA?=y
 +#JAVA?=y
  CROSS_COMPILE?=
 +JAVAFLAGS?=
  ZEROCONF?=avahi

dev-embedded/phidget/files/phidget21-libdir.patch

➞

Show inline comments

 diff -c /home/ohnobinki/ivd/phidgetprogs/phidgetlinux/Phidgetlinux/phidget21/Makefile /tmp/buffer-content-3770fbg
 Allows support for me (I seem to be the only Gentoo amd64 user without a symlink from /usr/lib to /usr/lib64)
 --- Makefile	Mon Sep 22 14:48:19 2008
 +++ -content-3770fbg	Tue Sep 30 09:27:29 2008
@@ -150,7 +150,7 @@
  	cd Java ; jar cf ../$@ com/phidgets/event/*.class com/phidgets/*.class
  install: all
 -	$(INSTALL_LIB) libphidget21.so $(INSTALLPREFIX)/$(PREFIX)/lib
 +	$(INSTALL_LIB) libphidget21.so $(INSTALLPREFIX)/$(PREFIX)/$(LIBDIR)
  	$(INSTALL_FILE) phidget21.h $(INSTALLPREFIX)/$(PREFIX)/include
  uninstall:

dev-embedded/phidget/phidget-2.1.4.20080924.ebuild

➞

Show inline comments

deleted file

dev-embedded/phidget/phidget-2.1.5.20081023.ebuild

➞

Show inline comments

deleted file

dev-embedded/phidget/phidget-2.1.5.20090105.ebuild

➞

Show inline comments

-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="2"
 inherit versionator eutils java-pkg-opt-2
 MY_PV="$(get_major_version)$(get_version_component_range 2)"
 MY_PN="Phidgetlinux"
 DESCRIPTION="Phidget USB hardware interface library"
 MY_PV="$(get_major_version)$(get_version_component_range 2)"
 LONGNAME="Phidgetlinux"
 SRC_URI="http://www.phidgets.com/downloads/libraries/${LONGNAME}_${PV}.tar.gz"
 HOMEPAGE="http://www.phidgets.com"
 SLOT="0"
 SRC_URI="http://www.phidgets.com/downloads/libraries/${MY_PN}_${PV}.tar.gz"
 LICENSE="LGPL-2"
 KEYWORDS="x86 ~alpha ~ppc ~sparc ~hppa ~amd64"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="java"
 DEPEND="java? ( >=virtual/jdk-1.4 )"
 RDEPEND="java? ( >=virtual/jre-1.4 )"
 DEPEND="java? ( >=virtual/jdk-1.4 )"
 S=${WORKDIR}/${LONGNAME}/${PN}${MY_PV}
 src_unpack() {
 	unpack ${LONGNAME}_${PV}.tar.gz
 	cd "${S}"
 S=${WORKDIR}/${MY_PN}/${PN}${MY_PV}
 DOCS=../README udev/99-phidgets.rules
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}${MY_PV}-libdir.patch
 	epatch "${FILESDIR}"/${PN}${MY_PV}-2.1.5.20090105-crosscompile.patch
 	use java && epatch "${FILESDIR}"/${PN}${MY_PV}-java.patch
 	epatch "${FILESDIR}"/${PN}${MY_PV}-crosscompile.patch
 	epatch "${FILESDIR}"/${PN}${MY_PV}-java.patch
+}
 src_compile() {
 	echo cd "${S}"
 	cd "${S}"
 	if use java; then
 		emake CROSS_COMPILE=${CHOST}- JAVA=y JAVAFLAGS="$(java-pkg_get-jni-cflags)" jni || die "emake failed"
 	else
 		emake CROSS_COMPILE=${CHOST}- JAVA=n || die "emake failed"
 	fi
+}
 src_install() {
-	#it seems that phidget's install stuff wants these dirs to exist
+	#phidget's Makefile's install target requires that these dirs exist
 	dodir /usr/$(get_libdir) && \
 		dodir /usr/include || die "mkdir failed in creation of destination directories"
 	USEJAVA=n
 	use java && USEJAVA=y
 	emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${USEJAVA} || die "emake install failed"
 	if use java; then
 		java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so || die "registering java .so file failed"
 	fi
 		dodir /usr/include || die "mkdir failed to create installation target directories"
 	local usejava
 	use java && usejava=y || usejava=n
 	emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${usejava} \
 		|| die "emake install failed"
 	use java && java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so
+}

dev-embedded/phidget/phidget-2.1.6.20090430.ebuild

➞

Show inline comments

-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="2"
 inherit versionator eutils java-pkg-opt-2
 DESCRIPTION="Phidget USB hardware interface library"
 MY_PV="$(get_major_version)$(get_version_component_range 2)"
 LONGNAME="Phidgetlinux"
 SRC_URI="http://www.phidgets.com/downloads/libraries/${LONGNAME}_${PV}.tar.gz"
 HOMEPAGE="http://www.phidgets.com"
 MY_PN="Phidgetlinux"
 SLOT="0"
 DESCRIPTION="Phidget USB hardware interface library"
 HOMEPAGE="http://www.phidgets.com"
 SRC_URI="http://www.phidgets.com/downloads/libraries/${MY_PN}_${PV}.tar.gz"
 LICENSE="LGPL-3"
 KEYWORDS="x86 ~alpha ~ppc ~sparc ~hppa ~amd64"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="java"
 DEPEND="java? ( >=virtual/jdk-1.4 )"
 RDEPEND="java? ( >=virtual/jre-1.4 )"
 DEPEND="java? ( >=virtual/jdk-1.4 )"
-S=${WORKDIR}/${LONGNAME}/${PN}${MY_PV}
+S=${WORKDIR}/${MY_PN}/${PN}${MY_PV}
 src_unpack() {
 	unpack ${LONGNAME}_${PV}.tar.gz
 	cd "${S}"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}${MY_PV}-libdir.patch
 	epatch "${FILESDIR}"/${PN}${MY_PV}-2.1.5.20090105-crosscompile.patch
 	use java && epatch "${FILESDIR}"/${PN}${MY_PV}-java.patch
 	epatch "${FILESDIR}"/${PN}${MY_PV}-crosscompile.patch
 	epatch "${FILESDIR}"/${PN}${MY_PV}-java.patch
+}
 src_compile() {
 	echo cd "${S}"
 	cd "${S}"
 	if use java; then
 		emake CROSS_COMPILE=${CHOST}- JAVA=y JAVAFLAGS="$(java-pkg_get-jni-cflags)" jni || die "emake failed"
 	else
 		emake CROSS_COMPILE=${CHOST}- JAVA=n || die "emake failed"
 	fi
+}
 src_install() {
-	#it seems that phidget's install stuff wants these dirs to exist
+	#phidget's Makefile's install target requires that these dirs exist
 	dodir /usr/$(get_libdir) && \
 		dodir /usr/include || die "mkdir failed in creation of destination directories"
 	USEJAVA=n
 	use java && USEJAVA=y
 	emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${USEJAVA} || die "emake install failed"
 	if use java; then
 		java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so || die "registering java .so file failed"
 	fi
 		dodir /usr/include || die "mkdir failed to create installation target directories"
 	local usejava
 	use java && usejava=y || usejava=n
 	emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${usejava} \
 		|| die "emake install failed"
 	use java && java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so
 	dodoc ../README udev/99-phidgets.rules
 	docinto examples
 	dodoc examples/*
+}

0 comments (0 inline, 0 general)