Changeset - 97f8bad9e0d5
[Not reviewed]
dev-embedded/phidget/Manifest
Show inline comments
 
AUX phidget-2.1.7.20100621-gentoo.patch 1152 RMD160 a66603d1eaa19f0046b1b60fc52f31fe8b49a02c SHA1 987ec42e4548a90514e3dd9c191864adb824a744 SHA256 a6de0d06ab9a0a1f776e5fa8da0475f4111774cec76e35c7725b0bfb05417ff2
 
DIST libphidget_2.1.7.20100621.tar.gz 675705 RMD160 7dd80f9e3dbec905ef0c050dc6f906fe7e6c18d8 SHA1 f56f5bb6f572c4e4c4a084228f7d1c701fb6ecdf SHA256 63a1a7157f4a2b976b6d6858d8ae03ebef2fdc44f8dbb5832a3bfe2c9579e20c
 
EBUILD phidget-2.1.7.20100621.ebuild 976 RMD160 dcd9f8ceb3bcef08d7aeddbffe249e85d7213407 SHA1 484312572f25d3b7ff5867c97fe03290e8cf4819 SHA256 84dc7ef135f88ef4ddaa8f35d885af115c3b470af1d33c40898b8c7293aa74c8
 
-----BEGIN PGP SIGNED MESSAGE-----
 
Hash: SHA1
 

	
 
AUX phidget21-gentoo.patch 1152 RMD160 a66603d1eaa19f0046b1b60fc52f31fe8b49a02c SHA1 987ec42e4548a90514e3dd9c191864adb824a744 SHA256 a6de0d06ab9a0a1f776e5fa8da0475f4111774cec76e35c7725b0bfb05417ff2
 
DIST Phidgetlinux_2.1.6.20090430.tar.gz 342985 RMD160 a45e335c4672e918152537cd771bcd4b21a85ddf SHA1 60fadd7ba15342b2ad6c58b19d659532fe963513 SHA256 b1cf06ecae292c2b201c30878fa2e89c2251d8a0b994a9227870a7ce52dc2605
 
DIST phidget21jar_2.1.6.20090430.zip 40828 RMD160 beabfd38a7d10f64a8c2b5eeb1ecefbcaeef283f SHA1 7759eae57ed3d8c0b0529d2b21cc566e0bbfe93e SHA256 d9302fb72bb1f11d7473346c6ac30efcf1fe7ea8b89a05c0405b0e6c3880d134
 
EBUILD phidget-2.1.6.20090430.ebuild 1612 RMD160 1c6d5d465063545cf552165d7be6a12240b83325 SHA1 379e0c184280839a412c1d4710ae0952d8aa2156 SHA256 7643ff3ca38cdc0e847b57b1a1cb6ab8cc46dcc65d329f5742313ef904fccb20
 
MISC ChangeLog 3230 RMD160 0e60aaf9475dbf63a2f225dc976175f0ca72cdb2 SHA1 7729a0bb813e192870ae026a730e0d4162f65bce SHA256 f5ca44e18f4656c4e31140e165eb069821eca858026e7ae598bd8a9e023405e2
 
MISC metadata.xml 172 RMD160 ac9d8165526474ed01605b242677b133677d627e SHA1 379fab1397357de050c74be1cbbb2da37ee3fcdd SHA256 74bc726733e7fd45be5b7a40fe34b62f1502551d6ee5797e65fc75522ead5972
 
-----BEGIN PGP SIGNATURE-----
 
Version: GnuPG v2.0.11 (GNU/Linux)
 

	
 
iEYEARECAAYFAkuyjvAACgkQni8M22OVw8B6GACeN5RG3M1k4aAdbjBBH3R8OJ5i
 
pcsAoKDUxjPIlP+vNnUQ3XDTGbfylDow
 
=n8Ji
 
-----END PGP SIGNATURE-----
dev-embedded/phidget/files/phidget-2.1.7.20100621-gentoo.patch
Show inline comments
 
deleted file
dev-embedded/phidget/files/phidget21-gentoo.patch
Show inline comments
 
new file 100644
 
--- a/Makefile	2008-12-22 19:05:10.000000000 -0500
 
+++ b/Makefile	2010-03-30 19:33:08.000000000 -0400
 
@@ -1,26 +1,22 @@
 
 PREFIX=/usr
 
 DEBUG?=n
 
 DMALLOC?=n
 
-JAVA?=y
 
-CROSSCOMPILE?=n
 
+#JAVA?=y
 
+CROSS_COMPILE?=
 
+JAVAFLAGS?=
 
 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 ($(JAVA),y)
 
-JAVAHOME := /usr/java/j2sdk1.4.2_18
 
-JAVAFLAGS=-I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux
 
-else
 
-JAVAFLAGS=
 
-endif
 
+CC=$(CROSS_COMPILE)gcc
 
+AR=$(CROSS_COMPILE)ar
 
+CXX=$(CROSS_COMPILE)g++
 
+
 
+#ifeq ($(JAVA),y)
 
+#JAVAHOME := /usr/java/j2sdk1.4.2_18
 
+#JAVAFLAGS=-I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux
 
+#else
 
+#JAVAFLAGS=
 
+#endif
 
 
 
 ifeq ($(DMALLOC),y)
 
 DEBUGFLAGS=-DDMALLOC -DDMALLOC_FUNC_CHECK
 
@@ -157,7 +153,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.6.20090430.ebuild
Show inline comments
 
new file 100644
 
# Copyright 1999-2010 Gentoo Foundation
 
# Distributed under the terms of the GNU General Public License v2
 
# $Header: $
 

	
 
EAPI="2"
 

	
 
#base must be last to get base_src_prepare()
 
inherit java-pkg-opt-2 multilib toolchain-funcs versionator base
 

	
 
MY_PV="$(get_major_version)$(get_version_component_range 2)"
 
MY_PN="Phidgetlinux"
 

	
 
DESCRIPTION="Phidget USB hardware interface library"
 
HOMEPAGE="http://www.phidgets.com"
 
SRC_URI="http://www.phidgets.com/downloads/libraries/${MY_PN}_${PV}.tar.gz
 
	java? ( http://www.phidgets.com/downloads/libraries/phidget${MY_PV}jar_${PV}.zip )"
 

	
 
LICENSE="LGPL-3"
 
SLOT="0"
 
KEYWORDS="~amd64 ~x86"
 
IUSE="java"
 

	
 
DEPEND="java? ( virtual/jdk
 
		app-arch/unzip )"
 
RDEPEND="java? ( virtual/jre )"
 

	
 
S=${WORKDIR}/${MY_PN}/${PN}${MY_PV}
 

	
 
PATCHES=( "${FILESDIR}"/${PN}${MY_PV}-gentoo.patch )
 

	
 
src_compile() {
 
	local javaflags usejava maketarget
 
	if use java; then
 
		javaflags="$(java-pkg_get-jni-cflags)"
 
		usejava=y
 
		maketarget=jni
 
	else
 
		javaflags=
 
		usejava=n
 
		maketarget=all
 
	fi
 

	
 
	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" JAVA="${usejava}" JAVAFLAGS="${javaflags}" ${maketarget} || die
 
}
 

	
 
src_install() {
 
	#phidget's Makefile's install target requires that these dirs exist
 
	dodir /usr/{$(get_libdir),include} || die
 

	
 
	local usejava
 
	use java && usejava=y || usejava=n
 
	emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${usejava} || die
 

	
 
	if use java; then
 
		java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so
 
		java-pkg_dojar "${WORKDIR}/phidget${MY_PV}.jar"
 
	fi
 

	
 
	dodoc ../README udev/99-phidgets.rules || die
 
	docinto examples
 
	dodoc examples/* || die
 
}
dev-embedded/phidget/phidget-2.1.7.20100621.ebuild
Show inline comments
 
deleted file
dev-libs/cyrus-sasl/Manifest
Show inline comments
 
@@ -6,8 +6,6 @@ AUX cyrus-sasl-2.1.22-db4.patch 670 RMD1
 
AUX cyrus-sasl-2.1.22-gcc44.patch 540 RMD160 42889604f03e88d88204e5ab27fe82f7b06786d2 SHA1 9a6df4fef0e388b70d4da5675f994c94262aa992 SHA256 d803266d96bb3b9f46bc2ce4ec280509d769bbf9c1a226e20c13803db398a113
 
AUX cyrus-sasl-2.1.22-qa.patch 525 RMD160 9c8c5c1be5711b96f822e7192db8456a7b8eb1ae SHA1 17f07fb21a3ca01f8cf9c3ee7aa18632cf0dbb29 SHA256 56dbdc290871f3a42e507fe0be90431de15a832da7cf99bf3c21fb5aef05c8ac
 
AUX cyrus-sasl-2.1.23-authd-fix.patch 829 RMD160 93161e6f36a3718bf92186a2d16967fa79ed4ad3 SHA1 7355bfc5ee53c69385ddd8da9710a17d4257bba3 SHA256 8732176e4a493b6b1548dc4799bf6866b9c324f5ecaafc9d9beffe0ac423d43d
 
AUX cyrus-sasl-2.1.23-mysql.patch 3564 RMD160 80619fa280a40a0a18716625d7ae3cd4e93bea66 SHA1 e24aff5322af4a84b5b6a486d8201c345516fc0c SHA256 20f195dce0c6628bf2da660291dbad5801e2c1d2e29387570876ec4323159860
 
AUX cyrus-sasl-2.1.23-mysql.patch~ 3562 RMD160 fe7ae8c515ed33da4fd01f0eb81c678f1fb33789 SHA1 1694a662f8a7c01d0d9585a2bb55d1297ed61482 SHA256 b2dd82aebf0eecbb0b682b73c3f30bb7579616cdc02a98560f2af50438ac25e1
 
AUX java.README.gentoo 934 RMD160 53369bc85186e7be3e86a98d19a0a19ca4535c2b SHA1 8ddb577ffe968d4ff3cda27402ce21988c55519a SHA256 aeb733ab6371c1fe50e413e8469dcd11f0750b5afff489408c45f118857fc3fe
 
AUX pwcheck.rc6 538 RMD160 acd0c14abc01390b6bf0944c2b35691e00f4c27f SHA1 ef9ebcf058536a0429211d8ed0d35aacb84a35cf SHA256 9e0d9ab2f0d0f7bccbcc194f6cbfe8ed67e94958465a18f3985f3819f5ed04e1
 
AUX saslauthd-2.1.21.conf 926 RMD160 fab448738564cb27562a08363a9de84b1141bcc0 SHA1 3220aa01bc5aa3ed4163f3120790f581682fe2e3 SHA256 31e1676f845540dafa9c09799b110234a6362bcd056feaa1ae096e277c9d216e
 
@@ -18,7 +16,7 @@ DIST cyrus-sasl-2.1.22.tar.gz 1609278 RM
 
DIST cyrus-sasl-2.1.23-ntlm_impl-spnego.patch.gz 7462 RMD160 5931936a5271241a85fe6c7bc0ae3ebba9bd4534 SHA1 0e4e843823301ac16dec18d089010b7b33d548af SHA256 9514a7436b11184cfd7e8a9ccd3590ce9f89cf2dc272ffbbdeeab16f9ae4fe6f
 
DIST cyrus-sasl-2.1.23.tar.gz 1613642 RMD160 b2cd9734fa8b4bad82663517f019f9b92d9d3519 SHA1 5df33a6788d6cd8329b109eff777c6cfae1a21bd SHA256 20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136
 
EBUILD cyrus-sasl-2.1.22-r2.ebuild 8701 RMD160 2e5a297b04559b6d750a73b2acde7aa6797d896b SHA1 0f51b8c7d4e5b13a7655cf4727f6402e882c318e SHA256 9a8903ce85478abed7d11e472139699c759cf3381a8e39ee72f2427beacb1de8
 
EBUILD cyrus-sasl-2.1.23-r1.ebuild 8492 RMD160 775cddca7d5801a7265f9542973ed64f48ad84ce SHA1 d360fe4e410dd5f263458dd843c78a302e7bba30 SHA256 99b672d3ac2602a1eab76bc68eb8c263d42d416d1e9acdb5f6062e2321ffb0cc
 
EBUILD cyrus-sasl-2.1.23-r1.ebuild 8453 RMD160 a0a75965a0b342848c372dc4d7e79648a47d984d SHA1 63a7d8395c7791304af70cd689f1013c4963ea02 SHA256 bd0608b88a23c49bba015097ba9acdd1b15bd8eb6e6d61ff91f71997fb658676
 
EBUILD cyrus-sasl-2.1.23.ebuild 8736 RMD160 287231b95e07140826bbe2c012b0045aaffe1d54 SHA1 e95581eb220094560867f41bcd64a40db5170e06 SHA256 723722396571adf5c202841f54118c44e475f782dbb20cc94820e268ed67600d
 
MISC ChangeLog 35614 RMD160 8d10c8a441729adee481ef25dd6650825879fe7f SHA1 60fa4c4b4294e13076304d9bae86446554395a98 SHA256 0d6cb68a4b08bf1ebe3f8abed7594abbf1b15ba4b0d92b5733082a46abf6e558
 
MISC metadata.xml 604 RMD160 5fa3550757ac41ba71c01624d2ccda299d16ee6a SHA1 44e30f2536736489247a4cb6aa7af21439a300d8 SHA256 149340f6876213ebfa34eb30195e6cd3403909c0afcbdc805ce46e9efdf5229e
dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r1.ebuild
Show inline comments
 
@@ -66,7 +66,6 @@ src_unpack() {
 
	epatch "${FILESDIR}"/${PN}-2.1.22-db4.patch #192753
 
	epatch "${FILESDIR}/${PN}-2.1.22-gcc44.patch" #248738
 
	epatch "${FILESDIR}"/${P}-authd-fix.patch
 
	epatch "${FILESDIR}"/${P}-mysql.patch
 

	
 
	# Upstream doesn't even honor their own configure options... grumble
 
	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
net-irc/anope/Manifest
Show inline comments
 
@@ -2,10 +2,6 @@ AUX anope.confd 319 RMD160 0c5d646bfa55a
 
AUX anope.initd 575 RMD160 59f2759c0b3918f4d510c4f5f738dc40e079a511 SHA1 4669ee3d2eec9251b763438e0627f7152b5afc5a SHA256 bf510cb3eb2c9839630f834bc2730c6b4d3da9a7d9a671b02eefefad5f39ed1d
 
AUX pid-patch.diff 450 RMD160 d18ab894895db105c91d0d1e24af2aff79f1bd13 SHA1 87be4165d15dbc6bfc972972d588e127ab492135 SHA256 cd3f266cd236e6a5bb7d15b502631e8992289455f7e308d94ac14e3b13314dc5
 
DIST anope-1.8.0.tar.gz 1559446 RMD160 fc54c552de5bcfc1d3b620c442e4f5a7081734a3 SHA1 0e7106fd65c7dec4187fae26ac1ca6375fe694f1 SHA256 e0c03d2590d3da273e4fb2bb5ec8056f85045979f86e6224bfe895f16a1fd41d
 
<<<<<<< local
 
EBUILD anope-1.8.0.ebuild 4291 RMD160 4f65e94bda9416f8fe14cf640faa42c6c04630d0 SHA1 49b498963b263242dcfe4468600cef2140e7855b SHA256 dd95d53cbd4ecb563ca58c9968698b54a2d6288efcc40cbe1cbe249ed27cd0a0
 
=======
 
EBUILD anope-1.8.0.ebuild 4284 RMD160 b0caeea9896e3f3bbdb891e9df00874f641cba0e SHA1 b7015b938d8e5ac5e84fe888a518adfad936ef08 SHA256 497d6d53172a3dbdf313a06d70800a77522402073850b0a651af050cba56db15
 
>>>>>>> other
 
MISC ChangeLog 2512 RMD160 6f84a8905a5305da72de177e6d363de1ac98fffa SHA1 b6f4dea8590aa0d243989af07aae654a85ca1929 SHA256 64fa7722550962462d3cd5f9374446cecbb4bb0cceeadb9a789542a181ed5363
 
MISC metadata.xml 467 RMD160 4d1ba922dab10abae80273bc1113710cd5c03702 SHA1 789db76ef094d3a024a17274428e736e456ec598 SHA256 3264e2596d73f5b371b1442dfb31892b557ac5fb795d7712ddf2d335d94bbd3e
net-irc/anope/anope-1.8.0.ebuild
Show inline comments
 
@@ -2,11 +2,7 @@
 
# Distributed under the terms of the GNU General Public License v2
 
# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/anope-1.8.0.ebuild,v 1.1 2009/06/27 11:04:34 patrick Exp $
 

	
 
<<<<<<< local
 
EAPI="3"
 
=======
 
EAPI="2"
 
>>>>>>> other
 

	
 
inherit eutils versionator
 

	
 
@@ -42,11 +38,7 @@ src_prepare() {
 
	epatch "${FILESDIR}"/pid-patch.diff
 

	
 
	if use atheme; then
 
<<<<<<< local
 
		cp ${EROOT}usr/share/doc/atheme*/contrib/anope_convert.c src/modules/ || die
 
=======
 
		cp /usr/share/doc/atheme*/contrib/anope_convert.c src/modules/ || die
 
>>>>>>> other
 
	fi
 
}
 

	
net-irc/libircclient/Manifest
Show inline comments
 
deleted file
net-irc/libircclient/files/libircclient-1.3-autotools.patch
Show inline comments
 
deleted file
net-irc/libircclient/libircclient-1.3.ebuild
Show inline comments
 
deleted file
0 comments (0 inline, 0 general)