Query value of udevdir from udev.pc pkg-config file.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

3 files changed, 244 insertions, 16 deletions

diff --git a/net-dialup/misdn/ChangeLog b/net-dialup/misdn/ChangeLog
index 532f29ff6a2f..430d5b90f41e 100644
--- a/net-dialup/misdn/ChangeLog
+++ b/net-dialup/misdn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/misdn
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.29 2008/08/23 03:09:44 cardoe Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.30 2012/08/12 15:07:38 ssuominen Exp $
+
+*misdn-1.1.7.2-r1 (12 Aug 2012)
+
+  12 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +misdn-1.1.7.2-r1.ebuild:
+  Query value of udevdir from udev.pc pkg-config file.
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/net-dialup/misdn/Manifest b/net-dialup/misdn/Manifest
index a45f80b1f4a8..f7f63b9eba40 100644
--- a/net-dialup/misdn/Manifest
+++ b/net-dialup/misdn/Manifest
@@ -1,19 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX README.hfcmulti 2488 RMD160 6c4e62fdfd6ce872b0ec270271ce97954c6374f4 SHA1 94af469baeab0972539a9dc707d1a334dfe0b1b5 SHA256 29793879cd9a752fb1f71e9f9aebc8988024b5ec8cdb53d0d551fc75ade0377f
-AUX misdn-2.6.23.diff 1329 RMD160 d78ea95e4c1847ee865fef10e2b44346607c4fc8 SHA1 47c0661681a09d5ee54368bec58a81fda2b1d921 SHA256 a31e4b8f29f0bc9d032eb3f1d382274e36e105b679ddb9ff23128bf75e5b763e
-AUX misdn-2.6.24.diff 11969 RMD160 f149723b72ead86cbc1f47f0956494f774de7ab0 SHA1 05d250a90a3662bad52f2d74e51ad00641dc4308 SHA256 bb62d30fec3eea7a80d42caec72d2b6915bc218956e47513ef540fb9e6f43725
-DIST mISDN-1_1_7.tar.gz 471967 RMD160 158d297b83d7157dd5d7d6ae742f6f358c5512e0 SHA1 d4368bd71f7be2302a8144e4ae422284c6eccafc SHA256 d3228fafe17046150062f296549abbdccaa9f976e9275f0edd12d1a25ca93f2b
-DIST mISDN-1_1_7_2.tar.gz 477593 RMD160 d7a3c358f2b67e0d84cbec02a877dac3a6f7bfa2 SHA1 95225e6376b896bfd23c44f5e440de10ca824f27 SHA256 24a63f063d9a3cbdaa2e7f5a3f9fb55988ba3f08cb5ccf19c3d7eb726eb806d9
-EBUILD misdn-1.1.7.2.ebuild 6014 RMD160 19c7e1755bdc75faccf9df7be61862b716813614 SHA1 2f5f29de853978ff4acb37010bfa001330db1602 SHA256 b36d4c2d14b4417fbaeefe60b9f1fc3ba0f256250331c06f2c3fd9afdec11993
-EBUILD misdn-1.1.7.ebuild 5344 RMD160 9ec4177948ee1c657d4027cee2d0f26f48cdd2ba SHA1 c86ae21431e1bd9468d010693bab4a01a2518474 SHA256 12e8b4c508248bedb729d9e81b7c70fbb5f2e84591d414f7e2de1f6752673ddd
-MISC ChangeLog 5203 RMD160 ce92d39966e605c65878fcd6df8ef8b4bc8cfd4a SHA1 54498b31096c7dceea5f1798ce5e2502481082a5 SHA256 0f8a20d69874c2d1ba2ad6274327a39ce239a5f3bf3102934bfa1bf0e5afdfa8
-MISC metadata.xml 446 RMD160 e99c3ebbbf12e7775ac13c6e37be1696020408a3 SHA1 e87684d94ab0c1130668c89e422203ec1e2d1754 SHA256 4758fca4e5a42fb513396be46ad1254a719ea9027463961e4024659156ee0607
+AUX README.hfcmulti 2488 SHA256 29793879cd9a752fb1f71e9f9aebc8988024b5ec8cdb53d0d551fc75ade0377f SHA512 6b9eff7032a05071a92e5d713911d9bf36a82e92b9360992a5108191a93dfa55ecd7eb6abdf3d4fd82ebf3cff92d6c01271b1b5c671a9e27ee58602c064e4fdd WHIRLPOOL c084a8ca4509ff5b1e471d64e10233bab5d64e96d2031b05306e28e8ed599646d7916b8b84bea1c2e31370c7d8fb26c10b393618b11735f80d3dcaadbb39c3e5
+AUX misdn-2.6.23.diff 1329 SHA256 a31e4b8f29f0bc9d032eb3f1d382274e36e105b679ddb9ff23128bf75e5b763e SHA512 d987ccbd58181d68622eabf113359e7a320f78b7e812afbdae517f4b734e9348d423c44bc69db45f3c5a534897eefbd288545aefcdaddf40ecf263d3b47fb48f WHIRLPOOL baae7aea25b94b6656a439bd40da648f0607fc7e01458f20d7f7afc49c877915bd1a8c286c63a3ac9758e418d2f641574c3d104b245ddc2def28842140cdeddf
+AUX misdn-2.6.24.diff 11969 SHA256 bb62d30fec3eea7a80d42caec72d2b6915bc218956e47513ef540fb9e6f43725 SHA512 2a3bd36c0239d5abc2ccf2b4dca66e443e7c3ec8e7dc55af43b9f29e31199e3e6382ab0cfb695ce115f8398616d903a8c8ad1194b2dd9f28f075c70eda2fdd43 WHIRLPOOL 715ab96085a9bee235e69154d2693ca88b3fa51fca20c00877816a83126deaa54a95339078fd4615e4ff341b161edef3b80176ae4f4e456aee85d7fe56732077
+DIST mISDN-1_1_7.tar.gz 471967 SHA256 d3228fafe17046150062f296549abbdccaa9f976e9275f0edd12d1a25ca93f2b
+DIST mISDN-1_1_7_2.tar.gz 477593 SHA256 24a63f063d9a3cbdaa2e7f5a3f9fb55988ba3f08cb5ccf19c3d7eb726eb806d9
+EBUILD misdn-1.1.7.2-r1.ebuild 6174 SHA256 25547db031aab6c0581f59cf22294461dc70821a740679f747a010842154bd65 SHA512 9aa1eed351186db81e203b87c694d66142870fa3800b356c688dd8e937f8192bb8488ce8f9e5ca44f156b786a76b2711f1e971529ab75664bafd12ebd1665b03 WHIRLPOOL 50eae069fdffdf14dafc04073bca126239fcc91f806a8f1904dc9f300716a49225fdf6c334a2723af98b63b71b2e23b591c11c0a3e1a9af76b5195f4350fa073
+EBUILD misdn-1.1.7.2.ebuild 6014 SHA256 b36d4c2d14b4417fbaeefe60b9f1fc3ba0f256250331c06f2c3fd9afdec11993 SHA512 f3b0f9b2479e0ee5487802b89f64f94239620e4a9c1d80755bcd221e20b99296db12c777c622e3c623c664697c367869fe3d26734079b074193154998b33592a WHIRLPOOL 54ef7388eaee53cb6143cc15ee764b456281959977022930dd006d4baef16921bb668662036ee557954c6877e310ee78494d22a5f294bc9dedd9ba8ab7255791
+EBUILD misdn-1.1.7.ebuild 5344 SHA256 12e8b4c508248bedb729d9e81b7c70fbb5f2e84591d414f7e2de1f6752673ddd SHA512 3c85135a65b4b03d50df7cae0efae4e76922db62aca591c3a598e15ca3ae5bd189ec234c60dd6e6fab2176186ca58b727508dc78dbb1b3df0d183e1aa51bd118 WHIRLPOOL c2981602e8d927533d68928c14aec4b27b92e53f1ca4a69124b49935668477745104a5b65e4ed77dc91ef134c42259ae4f5bb29ad8e17cfc08198157ff56c07a
+MISC ChangeLog 5375 SHA256 8aaeb60e507576eed9cc29ef968c0e8f1b415bfc3322fcd7e9db70116ac2f7af SHA512 eb007a23b8b903dc0b83ab67920b259ae0f148159ae2a54256d2300b3e9c4a3302602c4baeb677ccd2ca8edbf63dfda8b6d75affe74357269f9494150db152e9 WHIRLPOOL 3817aff2a7fadf8e71f69a255ef932627641e0ea5c4c790f1fa7db2fdbe389b2feb39666e33db8e3f51a384581a1d24af09c8478590dcee75137b00932408e82
+MISC metadata.xml 446 SHA256 4758fca4e5a42fb513396be46ad1254a719ea9027463961e4024659156ee0607 SHA512 b7951c7c9e9944d8cd017110428d93317c922f858a5d7166d163287eea56855723e6e3ca125193c051cbb7a75ad8021e3efb9f5b6205c4a1405610ce443b7912 WHIRLPOOL cdceb07528d21bb386c953cc792e8d4e0d8a48c275829956297775d83a49c0b6d0c09d57f0c90a67df9cb55f1ce45d93cc8933a35411e9dedecdc4d6c78e9b39
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkivf34ACgkQoeSe8B0zEfwBsACfZ4aaDQ34ZS3cTEaMwdLbyCSd
-iVUAmwRQahbjtdzMyjbozDKocG+TTclB
-=Upd/
+iQEcBAEBCAAGBQJQJ8aXAAoJEEdUh39IaPFN40YH/2G6T8t+iPObvSEO4U9nycrl
+pBRfqOZ48Br5SJyHt1KLmummHYcWe0ZubvTXs1lpufwdWQRRjQcUYgVXWRru99sw
+bXmOlv0eN/5wMEfwTWl4YUR7h8A0uTDx7SGyD8xIj8bo0nTH0CjHbWsX8XRvLc/t
+sd+iX4ywVpcMhGYgdfhGi9oFgx2I5ZBzd6i6pS/8n78x/7ho/214qks2oz+tV9Cf
+FA7TnHrJ3oLw9PBDaSn9ta56IjVmwXo3OvRkmqQesgIldnl1oOVTOgF1dCmXPfwK
+UPL9qlir+IwUHTRRrrwfQQpU4AyY684x5YADb9O7+GsyiSSgIXQAgfTgUELTYJE=
+=2IYI
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/misdn/misdn-1.1.7.2-r1.ebuild b/net-dialup/misdn/misdn-1.1.7.2-r1.ebuild
new file mode 100644
index 000000000000..c5eccf988b69
--- /dev/null
+++ b/net-dialup/misdn/misdn-1.1.7.2-r1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-1.1.7.2-r1.ebuild,v 1.1 2012/08/12 15:07:38 ssuominen Exp $
+
+inherit eutils linux-mod toolchain-funcs
+
+MY_P=mISDN-${PV//./_}
+
+DESCRIPTION="mISDN is the new ISDN stack of the linux kernel 2.6"
+HOMEPAGE="http://www.misdn.org/"
+SRC_URI="http://www.misdn.org/downloads/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="net-dialup/capi4k-utils
+	dev-libs/libxslt
+	sys-devel/bc"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# list of echo canceller use flags,
+# first active in this list is selected (=order does matter)
+MISDN_EC_FLAGS=("ecmg2" "eckb1" "ecmark2")
+
+# list of card modules
+MISDN_MODULES=("avmfritz"  "hfcpci" "hfcmulti" "hfcsusb" "hfcsmini" "xhfc" "sedlfax"  "w6692pci" "netjetpci")
+MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB"  "HFCMINI"  "XHFC" "SPEEDFAX" "W6692"    "NETJET")
+
+IUSE="ecaggressive ${MISDN_EC_FLAGS[*]}"
+for i in ${MISDN_MODULES[@]}; do IUSE="${IUSE} misdn_cards_${i}"; done
+
+MY_S=${WORKDIR}/${MY_P}
+S=${MY_S}/drivers/isdn/hardware/mISDN
+
+### Begin: Helper functions
+
+select_echo_cancel() {
+	local i myEC=${MISDN_EC_FLAGS[0]}
+	for i in ${MISDN_EC_FLAGS[*]}; do
+		if use ${i}; then
+			myEC=$(echo "${i}" | sed -e "s:^ec\(.*\):\U\1\E:")
+			break;
+		fi
+	done
+	echo "${myEC}" | sed -e "s:^ec\(.*\):\U\1\E:"
+}
+
+dsp_enable() {
+	local i
+	for i in "${@}"; do
+		sed -i -e "s:.*\(#include.*dsp_${i}\):\1:m" dsp.h
+	done
+}
+
+dsp_disable() {
+	local i
+	for i in "${@}"; do
+		sed -i -e "s:.*\(#include.*dsp_${i}\)://\1:m" dsp.h
+	done
+}
+
+### End: Helper functions
+
+#CONFIG_I4L_CAPI_LAYER -> I4LmISDN
+#CONFIG_MISDN_MEMDEBUG -> memdbg
+#CONFIG_MISDN_NETDEV -> netdev
+
+# def SYSFS_SUPPORT
+
+pkg_setup() {
+	local USERCARD CARD EC NUM=0
+
+	CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL"
+	kernel_is ge 2 6 24 && CONFIG_CHECK="${CONFIG_CHECK} PCI_LEGACY"
+	linux-mod_pkg_setup
+
+	# base modules
+	BUILD_TARGETS="modules"
+	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} MINCLUDES=${MY_S}/include CONFIG_MISDN_DRV=m"
+	MODULE_NAMES="mISDN_core(net:) mISDN_isac(net:) mISDN_l1(net:) mISDN_l2(net:)
+			mISDN_x25dte(net:) l3udss1(net:) mISDN_capi(net:) mISDN_dtmf(net:)"
+
+	# extra modules
+	BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_DSP=m CONFIG_MISDN_LOOP=m CONFIG_MISDN_DEBUGTOOL=m"
+	MODULE_NAMES="${MODULE_NAMES} mISDN_dsp(net:) mISDN_loop(net:) mISDN_debugtool(net:)"
+
+	# check if multiple echo cancellers have been selected
+	EC_SELECTED=$(select_echo_cancel)
+	for EC in ${MISDN_EC_FLAGS}; do
+		use ${EC} && : $((NUM++))
+	done
+	if [ ${NUM} -gt 1 ]; then
+		# multiple flags are active, only the first in the MISDN_EC_FLAGS
+		# list will be used, make sure the user knows about this
+		ewarn "Multiple echo canceller flags are active but only one will be used!"
+		ewarn "Selected: ${EC_SELECTED}"
+	else
+		elog "Selected echo canceller: ${EC_SELECTED}"
+	fi
+
+	# Check existence of user selected cards
+	if [ -n "${MISDN_CARDS}" ]; then
+		for USERCARD in ${MISDN_CARDS}; do
+			for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
+				if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then
+					MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
+					BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=m"
+					continue 2
+				fi
+			done
+			die "Module ${USERCARD} not present in ${P}"
+		done
+	else
+		elog "You can control the modules which are built with the variable"
+		elog "MISDN_CARDS which should contain a blank separated list"
+		elog "of a selection from the following cards:"
+		elog "   ${MISDN_MODULES[*]}"
+		# enable everything
+		for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
+			MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
+			BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=m"
+		done
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# mostly backported from mISDN-git, so it should
+	# not be needed anymore next version ;-)
+	epatch "${FILESDIR}/misdn-2.6.24.diff"
+
+	cd "${S}"
+	sed -i -e "s:^\(CFLAGS\):EXTRA_\1:g" "Makefile"
+
+	sed -i -e "s:^\(USER=\).*:\1root:" \
+		-e "s:^\(GROUP=\).*:\1uucp:" \
+		"${MY_S}/misdn-init"
+
+	sed -i -e "s:^\(DEVNODE_user=\).*:\1'root':" \
+		-e "s:^\(DEVNODE_group=\).*:\1'uucp':" \
+		-e "s:^\(DEVNODE_mode=\).*:\1'0660':" \
+		"${MY_S}/config/mISDN"
+
+	if use ecaggressive; then
+		sed -i -e "s:.*\(#define.*AGGRESSIVE_SUPPRESSOR\):\1:m" dsp.h
+	fi
+
+	case "${EC_SELECTED}" in
+		MG2)
+			dsp_enable  mg2ec
+			dsp_disable kb1ec mec2
+			;;
+		KB1)
+			dsp_enable  kb1ec
+			dsp_disable mg2ec mec2
+			;;
+		MARK2)
+			dsp_enable  mec2
+			dsp_disable mg2ec kb1ec
+			;;
+	esac
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/include/linux
+	doins "${MY_S}/include/linux/"*.h
+
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	dodir "${udevdir}"/rules.d
+	echo 'KERNEL=="obj-*", NAME="mISDN", GROUP="uucp", MODE="0660"' \
+		> "${D}/${udevdir}"/rules.d/53-${PN}.rules
+
+	insinto /etc/modprobe.d
+	newins "${MY_S}/mISDN.modprobe.d" ${PN}
+	dosbin "${MY_S}/misdn-init"
+	dodoc "${MY_S}/README.misdn-init"
+
+#	insinto /etc
+#	doins "${MY_S}/config/mISDN.conf"
+	insinto /usr/lib/mISDN
+	doins "${MY_S}/config/"*.xsl
+	dosbin "${MY_S}/config/mISDN"
+	dodoc "${MY_S}/config/README.mISDN"
+
+	dodoc Kconfig.v2.6 "${FILESDIR}/README.hfcmulti"
+}
+
+pkg_preinst() {
+	# save old config, in case portage will remove it
+	if [ -e "${ROOT}etc/misdn-init.conf" ]; then
+		cp -pf "${ROOT}etc/misdn-init.conf" "${ROOT}etc/misdn-init.conf.pkginst"
+	fi
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# restore old config, in case portage removed it
+	if [ -e "${ROOT}etc/misdn-init.conf.pkginst" ]; then
+		if [ -e "${ROOT}etc/misdn-init.conf" ]; then
+			rm -f "${ROOT}etc/misdn-init.conf.pkginst"
+		else
+			mv -f "${ROOT}etc/misdn-init.conf.pkginst" "${ROOT}etc/misdn-init.conf"
+		fi
+	fi
+
+	ewarn
+	ewarn "This driver is still under heavy development"
+	ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org"
+	ewarn "Please report driver bugs to the mISDN mailing-list:"
+	ewarn "    https://www.isdn4linux.de/mailman/listinfo/isdn4linux"
+}