summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Rüger <mrueg@gentoo.org>2014-03-31 00:50:37 +0000
committerManuel Rüger <mrueg@gentoo.org>2014-03-31 00:50:37 +0000
commitf29c2479d3b0549e5652a73157aab7098ae006f6 (patch)
tree38569a44c58a57d72dda3320c6ad350dcac15d0c /app-misc
parentMove p.u.s.m masks from default/linux/{amd64,x86}/13.0/ to arch/{amd64,x86}/. (diff)
downloadhistorical-f29c2479d3b0549e5652a73157aab7098ae006f6.tar.gz
historical-f29c2479d3b0549e5652a73157aab7098ae006f6.tar.bz2
historical-f29c2479d3b0549e5652a73157aab7098ae006f6.zip
Cleanup old. Drop stable ppc keyword.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/ddccontrol-db/ChangeLog5
-rw-r--r--app-misc/ddccontrol-db/Manifest24
-rw-r--r--app-misc/ddccontrol-db/ddccontrol-db-20061014.ebuild29
-rw-r--r--app-misc/ddccontrol/ChangeLog10
-rw-r--r--app-misc/ddccontrol/Manifest31
-rw-r--r--app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild73
-rw-r--r--app-misc/ddccontrol/ddccontrol-0.4.2-r2.ebuild80
-rw-r--r--app-misc/ddccontrol/ddccontrol-0.4.2_p20130703.ebuild76
-rw-r--r--app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch60
-rw-r--r--app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch14
-rw-r--r--app-misc/ddccontrol/files/ddccontrol-0.4.2-pciutils-libz.patch19
-rw-r--r--app-misc/ddccontrol/files/ddccontrol-0.4.2-support-fglrx.patch606
12 files changed, 15 insertions, 1012 deletions
diff --git a/app-misc/ddccontrol-db/ChangeLog b/app-misc/ddccontrol-db/ChangeLog
index ddd791f7a2c8..9690e1a72114 100644
--- a/app-misc/ddccontrol-db/ChangeLog
+++ b/app-misc/ddccontrol-db/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-misc/ddccontrol-db
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol-db/ChangeLog,v 1.21 2014/03/12 05:04:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol-db/ChangeLog,v 1.22 2014/03/31 00:50:33 mrueg Exp $
+
+ 30 Mar 2014; Manuel Rüger <mrueg@gentoo.org> -ddccontrol-db-20061014.ebuild:
+ Cleanup old. Drop stable ppc keyword.
09 Mar 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
ddccontrol-db-20061014_p20121105.ebuild:
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
index b9c9ed24e01c..07191848ad34 100644
--- a/app-misc/ddccontrol-db/Manifest
+++ b/app-misc/ddccontrol-db/Manifest
@@ -1,26 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST ddccontrol-db-20061014.tar.bz2 209106 SHA256 ff88f8e5122a2ab7b69a961f267f74d09ec7c54e90453ee80930edf66955c7b8 SHA512 a18208c8d4fd0ba6eea445c30ee84538430bf59137445f0d586e53019d9d5723d6df3666f05cc66cdb835c52ef845c7b742e222e217e21b59b258902d61f0344 WHIRLPOOL 9b0582c3b23acaab1559c0504bdb27787666c2196a246a429ae27e2ec61096487e6406643eede68ebd245c1d32858b5444e087de3b6e8dee939607ec1af3da2f
DIST ddccontrol-db-20061014_p20121105.tar.gz 62043 SHA256 6da0e41af98549a0cda31323dba6a4b87dbc08d5575f8c6b7c49379b88f4fd2e SHA512 323c2ac498f634d20a183ea96e67868b8f3e8bb26da0133b91848b06accbef5605b3d5ca56b4861a8d28d9da9a28b11579a2e1fcc248624835190cdb01943c80 WHIRLPOOL e6ddfbb369be0cfb2904f7d7ec91de2d8a6b3428f2461f491b3b85b2bab1f97fd2814436b57872d22d0d4434e24e0a9733e70af8719959b66fc48850eac4174a
-EBUILD ddccontrol-db-20061014.ebuild 827 SHA256 6ea70b1911f75832deb8eda60b866aee51ed4d74b5b15ea4fafa88d53312d8cc SHA512 9ed02ff0ce7e63db38d4f730df0bd4e0f09a6628b8ff0f15115fbf913768b73927fc10202c89ef3bc58e106176c7c44c8f8ba8e418b856c7fc7aad18f60632a2 WHIRLPOOL ad1690ed7d175f540be6f92278bd4a2577aed0a9e6c78358e0d5a6e8bff89b3acbc2686aa9c6b08eb79fb4e3cae0ec28612792db673b33dbb3c29c00bdb86a92
EBUILD ddccontrol-db-20061014_p20121105.ebuild 927 SHA256 772393d9d440b4499aa5d64080810070ab8b91c864bc56cc584e939092952da1 SHA512 79811c0e037e2fb908cde0b6eddfd42546bf6340c6408276f4fd613028daec5144993e8505dd3102a468abe21178176df1bb18d790f59f990c511b4a77bf48fe WHIRLPOOL 3bcad13e0959b96415834005df25889d3cb2a8f661a17f7cacc76322545719f03de23567df89c37d5e58706bd225403105398eaa8eac7322aeb9838f4806cc81
-MISC ChangeLog 3675 SHA256 3b95d184dea2aff170603b667112b52d3c5ea0cf0a53ba7e6e4a97033be7a5db SHA512 0dfbbd1402533c5be67056218c745ef38a0a52c49d878320dbe4916ada7e3281f5345ddfd9d06577a07350e4861727ff805e2cd0eeafb3abb99c746949ea29b2 WHIRLPOOL 093d6810dd142d39e8ef210e6eac51aab8693db98057a230ab3c3d2c94b857c52bb9bc64c17e9d3452f6c222f4176cdfad914733de6815c99e7dac030abbcec1
+MISC ChangeLog 3791 SHA256 d017542c2c718b1426f99a39169c653de4b18e9934c826f634140c4db68a0e62 SHA512 575f436400cc8bc10b4968c52501a4d44478def31c917e3ecdd38c99f6968500ca1c1c7dcc9fe544b76af2da29495bfbe871b10e54ffc252a52336045350979b WHIRLPOOL fa924c9503a01391a96b023d50f9b42fc4346a4d85a606ee16b243dc534f6bbcb7f51bbeb6d42f915404f43f6e8570351ee27f4af9a7b155a269d419e80cd7d6
MISC metadata.xml 227 SHA256 40232958c87526dc0167c155a26b0e5137b4e16e8c8912b87cf06e012737bce4 SHA512 44befc880c819dc21dd941cbb6751c432dc34663a56dce5ff18ea0b44089222b4a6ec31a3138f401639a7f53df8aae3192a16bb3b4ada7fff955e0f5254ba1b2 WHIRLPOOL be715b28ffd1bab7f84ae9d40e13e3ba482d6f71a95add4244fbc2b2b727da70c30d510835149d5c3dd6d2f0051ef8d49faecd909267287347399a339cd39fd6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTHEpIAAoJEE8aJVXqcZkdSFIP/0x4eHKzKZulYb8Y7tBcKQpx
-aWUO4ewmiztV5VCEhtZTv3sFy+FHt5yRGE6EtHmLLTWAQFtJMxxqt30prW9s0DE7
-j5iHr66qVi46FgEX2++gUpkX/+Ggf3uGGP8G3QQFzPi18Q/C8AkuF8w+WzL2n/Mo
-eO6eD76B17sLDdjl744G6iBd5SytS6oKR4wsCBkPVezqqw8vPDA7YBFD+8Z8UvNa
-1PY3VOZmUOny8SZb9y/1uvw4htnDqGdxkHlV3u0Euf9fJ49k4zMY/NGFOAxixjoV
-MZ9WlVhpygBhpMzfjE8XfwwC8Xf1rbQ74iSFvGSoRRwYkDrU8CWwZbcJ4U3P0Rd4
-v8WfxrPhzLXKxiNX+iC168m5jb+XwXCU04JsCrVmhd9TTt0VkcwXTSI0nxloimPk
-nE/ysUgfRxJXJT0gSFCjwX6bWjdR01IsFkmiu3VO/BUeaHrhkTUxtr+IP7bvuySi
-dKYDkdq+LNEGheHoyFqUeGB5GOnCmGl1/lcgDzRp5SAeeTBoH6JJJwSq9kEaPLZr
-41se5q001bikwQwb0qZAPc2NCUemPloYvFj3VhfAa5gAvAvBvF3lF0uB2R6AIHCX
-6tUuQ27wBgcpxq87OPA63Vl5+POI5xuPHPxW9snt3E0TCnbOJ3TU1Neg5nz3s8Y1
-saHqS8VnIk+ocrPaNUrU
-=BvaK
------END PGP SIGNATURE-----
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20061014.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20061014.ebuild
deleted file mode 100644
index c0f5834209c4..000000000000
--- a/app-misc/ddccontrol-db/ddccontrol-db-20061014.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol-db/ddccontrol-db-20061014.ebuild,v 1.7 2010/01/29 06:03:04 jer Exp $
-
-DESCRIPTION="DDCControl monitor database"
-HOMEPAGE="http://ddccontrol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/-db}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- dev-perl/XML-Parser"
-
-src_compile() {
- econf $(use_enable nls) || die "econf failed"
- # Touch db/options.xml.h, so it is not rebuilt
- touch db/options.xml.h
- emake # doesn't really build anything, but there for safety
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-misc/ddccontrol/ChangeLog b/app-misc/ddccontrol/ChangeLog
index 364149315e16..00e2a0694b8c 100644
--- a/app-misc/ddccontrol/ChangeLog
+++ b/app-misc/ddccontrol/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-misc/ddccontrol
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ChangeLog,v 1.38 2014/03/12 05:03:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ChangeLog,v 1.39 2014/03/31 00:49:57 mrueg Exp $
+
+ 30 Mar 2014; Manuel Rüger <mrueg@gentoo.org> -ddccontrol-0.4.2-r1.ebuild,
+ -ddccontrol-0.4.2-r2.ebuild, -ddccontrol-0.4.2_p20130703.ebuild,
+ -files/ddccontrol-0.4.2-automake.patch,
+ -files/ddccontrol-0.4.2-no-ddcpci.patch,
+ -files/ddccontrol-0.4.2-pciutils-libz.patch,
+ -files/ddccontrol-0.4.2-support-fglrx.patch:
+ Cleanup old. Drop stable ppc keyword.
09 Mar 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
ddccontrol-0.4.2_p20140105.ebuild:
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index d56a9482a0b3..37c7a148bddc 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1,33 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX ddccontrol-0.4.2-automake.patch 2149 SHA256 c31761783cfd9587fb68d94739794833a6f47789922017530de07fb1133f78b8 SHA512 93b731389bd8019aaae81201ce930d0b03fa80dde3a00970be804e90bff607d42746fe60d9162d99259e57f179e1e8e074b433d9877a7b6b41ce58aae2c47cbb WHIRLPOOL d408e442ddf4a10b2b8a7c3291b64cfdb718965f797c05a62a99aae4e614f74f109eb2580bd16147c95574536b17eddc698670ed0db66f232f2d5c8540266ae5
-AUX ddccontrol-0.4.2-no-ddcpci.patch 289 SHA256 9f2d7dfa3446374bf06995096e8cb6812322a2144d4ce0b45a1df20553b72130 SHA512 a8e39707ed2c938e5a5a5f16cc43104289fb6d15d40e1acf15115c2685310132620a3d7e4e5ade0a5c32f253dc38497d9065ed6f6ac79ae42f8e47b100e0c7dd WHIRLPOOL d0df66ed7f87ceacd9faf710b859f518c9ba5d8298aa04f4a0cf40f3e0923716558a5985280f030ef7ee9b6e71b468d7b3c140607a017e2bbf83a57b3edf72a8
-AUX ddccontrol-0.4.2-pciutils-libz.patch 1016 SHA256 014568b96f9450805e012d7dc5b0df0c4d3922694da4ad143bb96d429303fb9b SHA512 a3313aeca4ad4980aee656078d03c1755f390fe857c9dbcf890d951c52be6e6a9d7d17f82796da0ae329023ec69b5cc255d3f2455f4eb08eac4af5eb067e1708 WHIRLPOOL 1db877b4d05ec669dc42a1b10429efe69a851ff26594d809ae13452d97e7f513b7496e82d424948c5dcf2ebbda31d4333ed568cf87487184d8c7119496e7c5d3
-AUX ddccontrol-0.4.2-support-fglrx.patch 15900 SHA256 43db3565b8a2e8b527622436d8c6fd257053c93e2df9662c0e8f1a80526cf27f SHA512 4fc7321d28b7d17bcc0c3611e77d3fdcdbe46878ee757e84f2145668fceab4c5054b805b9d96a798ba4346b0b9936301e2ae7e1f7ab7e03d37a0f3dd00b18222 WHIRLPOOL 0639519b0708d1414b431661aa1cec9e8c90eca3ac9402a742af9b9509804465785461ce006c942e9c5073dc8778e090a15dcfc815c0063a1ed73a5e0cd25b46
-DIST ddccontrol-0.4.2.tar.bz2 421475 SHA256 986f3b4b27ec04e1da493de3aaab01cd5ea9566d7572c1a40b8d43cd7a491e84 SHA512 9e83570a7b481cec35a4f11e690a77b497067c88f97cee7c1927804991d41ca77cfc21edc98b915601c8807d661ea0fcdbb57ca330e8678b6f5fbfb96e4585a8 WHIRLPOOL 63e4fc2e80317bd17f8dac497b6a3985aec463a2ceea16677fd02183478c10c9bd16fca111e76978b5785b7d2b070773d6508637a5b0c6b9d673ccf22089ec0d
-DIST ddccontrol-0.4.2_p20130703.tar.gz 177759 SHA256 f61278b75a203b1430a2ed0bb784b6921379092d1b2a160d27aecb8f650b3036 SHA512 e00c91940052298473c1029b9caf5aae6200653702e63fe5eefc7e9da0513518c9f879ebaad96440e3fc3372a156953784a6992a56067ea12ce901c113269f46 WHIRLPOOL 3a04a7912a4b154bd5a333d25fdeeefd488890fb7dac37726b6cd0c41bdb95a6249c876142fa912048fa403708b7dcb5e1bbc071d0d98daf4c0b0c3d3ceffea6
DIST ddccontrol-0.4.2_p20140105.tar.gz 177771 SHA256 14026465b1c1b3bd0fecfe3f199139f1365317a0974844c82aa783f2125e064c SHA512 7a28e9b81ee14e0431c57d372c8d43f861f61c35b441111e1f42d1aa62c333b0cc6a101dcb39d30e9661aaa85a02d755e4adef3a9b20a6952e1599e3ac12c72f WHIRLPOOL 55083597ab4e7e78d5315f114b257f3bfbadd1712ad5bd27e88d3b18ca694554ec51542b2b9a88bd7e21ffbdc7d4f82b80f1d43b5f16f90bdcc2edfb2421c7a6
-EBUILD ddccontrol-0.4.2-r1.ebuild 1892 SHA256 5ba45c7a3280e424159c9fa3ce653be4397b1bbe78f7a2bb06bc85d137c6eb50 SHA512 9774699b73458a9b57a562eae67a107f7aeedcfc3d1b706956a69a041ab104b4cc327681b14e54a841c62721f15168959c12cffb15e08f2f8644cf26c24f3870 WHIRLPOOL a57531236c2dfb7eab18b18325a9e215dd97bc1c6be8b0e3f1e618a2bd2f4676308154a0f69849def45b75973f7f5708b963f267b0f8050bf147d4b4cd260c47
-EBUILD ddccontrol-0.4.2-r2.ebuild 2196 SHA256 f6b22ef3bcfc25712171769cdd4216f4e5363f0944e9c1514f1680afe186f0ab SHA512 a339cd99bba4884f26ed1e0b9dc41430e2769ae566fac8fbe0be026bfed9c68d2887b2eb6de543765c5551fccf699f98550e9b032d170176bd955d532d34ea23 WHIRLPOOL 4728c402418a3c3940e1b947406cee706ca87a03e4afd54fdfeaadcf88da3841aa269001827e4c0216c943a10a5e14786f33b9bb23e9ecc3df2749c7e2475679
-EBUILD ddccontrol-0.4.2_p20130703.ebuild 2148 SHA256 0ed3aad1270159c2137b75f953e8f578190c743095515ca4b6e33d8888ce9ce1 SHA512 c8afe6a9c4aad933adfae5f859237bacb4d61f90468be929f19b7841cf73b804189ae62b87c77d66b4e05439feb3ed0dff3d2d9513fd0267a26037e86d6e7975 WHIRLPOOL 3b03f05b33ab6c3bb63a5f839dd44bbfeca3b0acbda881900e68f817fcd657b6401ac6f60f52db81512bd5f53a89788487b364a4fab4b22dc940aaa81a8ac024
EBUILD ddccontrol-0.4.2_p20140105.ebuild 2134 SHA256 c86e0ac64c813729379497f20656a716ac87ed51e594b05374cf6d515539eef0 SHA512 eebf1a5865b68ccbc3785cd5f068f731495bbff3d5018b5c1c958c43fe6d221bf8d14693c3e799f5205f149041861fb0c1f55772ed6ecbea62074b0f6a2c0df4 WHIRLPOOL e44d3c42584c94d06516d0bc19e842820b9ca4e968efca9beaed06dee680fb93083c74701c2858b2d2cc81f4b7fe4754e74a47374f8a249ebd376c18784559ce
-MISC ChangeLog 6345 SHA256 d432bdd1fbc5d6b9657c07709fc81fe3d1a044b943567ccc221e78b9098e5247 SHA512 9ec7a10f09ef76c30cf0226af9267c69a1ad097d38ce0c1ecf5ae176753958e357a0da3b3897d62f282092bd9ed9a384089db3c2a5362a588cd8559b8cd78742 WHIRLPOOL 12ebb920be301c70640adc2930a6037da7d0055f86822e055418850d0bcb42a932bb12737adf8a7fe529effdc2329551492247e8d739749fc6f748874a2e3fd3
+MISC ChangeLog 6704 SHA256 cd8ae5f87d9f40ae0b603bfeb810ff9bf5a6b1cecfb7e68b2898854b04b0d542 SHA512 572f49aca4cfda79204d58afec141e8744fbed1c24fe46732a18a4b00424465341500f3be973d74d4917491ef1bc48e2a137f6f46e3a9d67f3e29ccb22dfa926 WHIRLPOOL ba3db4405c94acac935c8d1cf2b9aa45af65edcabfa87e75764e8bf495ee997e0cba008b7c208aca2acef73dc11009e2ae93c4fb18d5be3752f5107500c18e6c
MISC metadata.xml 325 SHA256 7eb1e77c71a9a9398646764cbd704e9c24ac52cd7ce592c4444f148d660bd653 SHA512 d7bc3021c66858ea5bf05ef7d6bb622d2bc8d113d4fe1c2025ef78fb6c05b43a41e35cf741dc12e6cdb10f67fdc3c0db280d154c89961d27ad16dad8670bff0a WHIRLPOOL 5ae6e68631c79b95734fad5d55949605546d88cdc9413a3523b864ea9d6b2c3374eafdd887ed6f1d2540eae5a7f005107df2336f6e534d15b6cbd74e155eebda
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTHEo3AAoJEE8aJVXqcZkdw28QAM5KpErvU6c/qdvAAcqx/SR1
-4nVXwdKSTR9F/0iKTWaH8ndjfyFj8s2Uf1QJYgMiSpasHN+WfYpvO+9rK9WIpHXk
-aGpzEA5Q+B6WGWvlIyWzIV1WJ4arb2GpzWnRz4Dj4Rlx0j2pgqYn4IK97loyQQnf
-FJQoYzYbNRo/XoA5duBsYk66ZhKOM5rkwojZoBHC+/cFZHHv7QDNcXEvU80eVjcg
-2drxYfzxmnILrpIjM3cu23l+Z+S5NABQEC9i2P8A5G/iuULA1Ow8eUgFuNXXlL1N
-at4+zalNmjEGov7+CvgRMzfPxSARC8jco+mg1VXV7DVLxHS4kM9wPtHle6BooE4C
-yux3xH6ax4txXqGrNBe3a6A0ot34p7eofX1Q86oxbEnYLTZyFys2p/jRfjH4DMCJ
-U+NzZjlJqG/XLBuguhjBNgVxnpH9QRbqUHp2pIM49Pu2YgXJYWgFrhB/33HOyUp1
-/EKxYiI3uO4AWrIk2PYBPIMO2t5KKMb3GP7nsu5EiVs1AKbs7jD3WrgcBWe4Ba2J
-1KPY/5v9WFdm1XcTpzDf2eRILfzW4cd1dFiykbyQ47KypJLmDN9FC7Pm6q9t0SCM
-8iS3GN557PX11G1+zLALicrXsy3YY6pHw0KDkwqPdQrNf/gJamWjiRgBTghxRQrZ
-uyJhtmYVSjWP3hbOW/43
-=I6oS
------END PGP SIGNATURE-----
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild
deleted file mode 100644
index 11e866ecf541..000000000000
--- a/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild,v 1.4 2012/08/08 22:32:18 blueness Exp $
-
-EAPI="4"
-
-inherit eutils autotools
-
-DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
-HOMEPAGE="http://ddccontrol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ddcpci doc gnome gtk nls static-libs"
-
-RDEPEND="dev-libs/libxml2:2
- gtk? ( >=x11-libs/gtk+-2.4:2 )
- gnome? ( >=gnome-base/gnome-panel-2.10 )
- sys-apps/pciutils
- nls? ( sys-devel/gettext )
- >=app-misc/ddccontrol-db-20060730"
-DEPEND="${RDEPEND}
- dev-perl/XML-Parser
- dev-util/intltool
- doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1
- >=dev-libs/libxslt-1.1.6
- app-text/htmltidy )
- sys-kernel/linux-headers"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-pciutils-libz.patch
- epatch "${FILESDIR}"/${P}-automake.patch
- epatch "${FILESDIR}"/${P}-no-ddcpci.patch
- sed -i '/^htmldir/d' doc/Makefile.am || die
-
- # ppc/ppc64 do not have inb/outb/ioperm
- # they also do not have (sys|asm)/io.h
- if ! use amd64 && ! use x86 ; then
- local card
- for card in sis intel810 ; do
- sed -r -i \
- -e "/${card}.Po/d" \
- -e "s~${card}[^[:space:]]*~ ~g" \
- src/ddcpci/Makefile.{am,in}
- done
- sed -i \
- -e '/sis_/d' \
- -e '/i810_/d' \
- src/ddcpci/main.c
- fi
-
- ## Save for a rainy day or future patching
- eautoreconf
- intltoolize --force || die "intltoolize failed"
-}
-
-src_configure() {
- econf \
- --htmldir='$(datarootdir)'/doc/${PF}/html \
- $(use_enable ddcpci) \
- $(use_enable doc) \
- $(use_enable gnome gnome-applet) \
- $(use_enable gtk gnome) \
- $(use_enable nls) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.2-r2.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.2-r2.ebuild
deleted file mode 100644
index be02944104ba..000000000000
--- a/app-misc/ddccontrol/ddccontrol-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ddccontrol-0.4.2-r2.ebuild,v 1.3 2014/01/03 18:56:34 mrueg Exp $
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
-HOMEPAGE="http://ddccontrol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ddcpci doc gnome gtk nls static-libs video_cards_fglrx"
-
-RDEPEND=">=app-misc/ddccontrol-db-20060730
- dev-libs/libxml2:2
- sys-apps/pciutils
- gtk? ( >=x11-libs/gtk+-2.4:2 )
- gnome? ( >=gnome-base/gnome-panel-2.10 )
- nls? ( sys-devel/gettext )
- video_cards_fglrx? ( x11-libs/amd-adl-sdk )"
-DEPEND="${RDEPEND}
- dev-perl/XML-Parser
- dev-util/intltool
- sys-kernel/linux-headers
- doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1
- >=dev-libs/libxslt-1.1.6
- app-text/htmltidy )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-pciutils-libz.patch \
- "${FILESDIR}"/${P}-automake.patch \
- "${FILESDIR}"/${P}-no-ddcpci.patch \
- "${FILESDIR}"/${P}-support-fglrx.patch
- sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
-
- sed -i '/^htmldir/d' doc/Makefile.am || die
-
- sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
-
- # ppc/ppc64 do not have inb/outb/ioperm
- # they also do not have (sys|asm)/io.h
- if ! use amd64 && ! use x86 ; then
- local card
- for card in sis intel810 ; do
- sed -r -i \
- -e "/${card}.Po/d" \
- -e "s~${card}[^[:space:]]*~ ~g" \
- src/ddcpci/Makefile.{am,ini} || die
- done
- sed -i \
- -e '/sis_/d' \
- -e '/i810_/d' \
- src/ddcpci/main.c || die
- fi
-
- ## Save for a rainy day or future patching
- eautoreconf
- intltoolize --force || die "intltoolize failed"
-}
-
-src_configure() {
- econf \
- --htmldir='$(datarootdir)'/doc/${PF}/html \
- $(use_enable ddcpci) \
- $(use_enable doc) \
- $(use_enable gnome gnome-applet) \
- $(use_enable gtk gnome) \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_enable video_cards_fglrx amdadl)
-}
-
-src_install() {
- default
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.2_p20130703.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.2_p20130703.ebuild
deleted file mode 100644
index 6f9981f55c96..000000000000
--- a/app-misc/ddccontrol/ddccontrol-0.4.2_p20130703.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ddccontrol-0.4.2_p20130703.ebuild,v 1.1 2014/01/04 04:46:54 mrueg Exp $
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
-HOMEPAGE="http://ddccontrol.sourceforge.net/"
-COMMIT_ID="5339ab459702e554592fa6cd851a2d03c38c20b8"
-SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ddcpci doc gnome gtk nls static-libs video_cards_fglrx"
-S=${WORKDIR}/${PN}-${COMMIT_ID}
-
-RDEPEND=">=app-misc/ddccontrol-db-20060730
- dev-libs/libxml2:2
- sys-apps/pciutils
- gtk? ( >=x11-libs/gtk+-2.4:2 )
- gnome? ( >=gnome-base/gnome-panel-2.10 )
- nls? ( sys-devel/gettext )
- video_cards_fglrx? ( x11-libs/amd-adl-sdk )"
-DEPEND="${RDEPEND}
- dev-perl/XML-Parser
- dev-util/intltool
- sys-kernel/linux-headers
- doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1
- >=dev-libs/libxslt-1.1.6
- app-text/htmltidy )"
-
-src_prepare() {
- sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
- sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
-
- # ppc/ppc64 do not have inb/outb/ioperm
- # they also do not have (sys|asm)/io.h
- if ! use amd64 && ! use x86 ; then
- local card
- for card in sis intel810 ; do
- sed -r -i \
- -e "/${card}.Po/d" \
- -e "s~${card}[^[:space:]]*~ ~g" \
- src/ddcpci/Makefile.{am,ini} || die
- done
- sed -i \
- -e '/sis_/d' \
- -e '/i810_/d' \
- src/ddcpci/main.c || die
- fi
-
- ## Save for a rainy day or future patching
- touch config.rpath ABOUT-NLS
- eautoreconf
- intltoolize --force || die "intltoolize failed"
-}
-
-src_configure() {
- econf \
- --htmldir='$(datarootdir)'/doc/${PF}/html \
- $(use_enable ddcpci) \
- $(use_enable doc) \
- $(use_enable gnome gnome-applet) \
- $(use_enable gtk gnome) \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_enable video_cards_fglrx amdadl)
-}
-
-src_install() {
- default
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch b/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch
deleted file mode 100644
index 005efc51c636..000000000000
--- a/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-taken from upstream git
-
-From 1c5eaf9ca5cb03d4124d54b4178d4a2a47a724d7 Mon Sep 17 00:00:00 2001
-From: Stanislav Brabec <sbrabec@suse.cz>
-Date: Sun, 10 Oct 2010 18:29:16 +0200
-Subject: [PATCH] Applied ddccontrol-libexecdir.patch
-
----
- .../GNOME_ddcc-applet.server.in.in | 2 +-
- src/gnome-ddcc-applet/Makefile.am | 12 +++++++-----
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in b/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
-index f3a28ba..89a6615 100644
---- a/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
-+++ b/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
-@@ -2,7 +2,7 @@
-
- <oaf_server iid="OAFIID:GNOME_ddcc-applet_Factory"
- type="exe"
-- location="@PKGLIBDIR@/ddcc-applet">
-+ location="@appletdir@/ddcc-applet">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:Bonobo/GenericFactory:1.0"/>
-diff --git a/src/gnome-ddcc-applet/Makefile.am b/src/gnome-ddcc-applet/Makefile.am
-index d16fbd0..6218efa 100644
---- a/src/gnome-ddcc-applet/Makefile.am
-+++ b/src/gnome-ddcc-applet/Makefile.am
-@@ -6,9 +6,10 @@ DDCC_LDADD = ../lib/libddccontrol.la
-
- EXTRA_DIST = GNOME_ddcc-applet.server.in.in GNOME_ddcc-applet.xml
-
--pkglib_PROGRAMS = ddcc-applet
--ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
-+applet_PROGRAMS = ddcc-applet
-+appletdir = $(libexecdir)
-
-+ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
- ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD)
- AM_CFLAGS = $(GNOME_CFLAGS) '-DPKGDATADIR="$(pkgdatadir)"'
-
-@@ -18,10 +19,11 @@ serverdir = $(libdir)/bonobo/servers
- server_in_files = GNOME_ddcc-applet.server.in
- server_DATA = $(server_in_files:.server.in=.server)
-
--$(server_in_files): $(server_in_files:.server.in=.server.in.in)
-- sed -e "s|\@PKGLIBDIR\@|$(pkglibdir)|" $< > $@
-+$(server_in_files): $(server_in_files:.server.in=.server.in.in) Makefile
-+ $(AM_V_GEN)sed \
-+ -e "s|\@appletdir\@|$(appletdir)|" \
-+ $< > $@
-
- CLEANFILES = $(server_in_files) $(server_DATA)
-
- @INTLTOOL_SERVER_RULE@
--
---
-1.7.4.1
-
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch b/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch
deleted file mode 100644
index 5ecb90f12a82..000000000000
--- a/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix building when ddcpci is disabled. just a hack while we sort
-out the real fix upstream.
-
---- a/src/gddccontrol/main.c
-+++ b/src/gddccontrol/main.c
-@@ -24,7 +24,7 @@
- #include <stdio.h>
- #include <unistd.h>
-
--#include "ddcpci-ipc.h"
-+#define IDLE_TIMEOUT 60
-
- #include "notebook.h"
-
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.4.2-pciutils-libz.patch b/app-misc/ddccontrol/files/ddccontrol-0.4.2-pciutils-libz.patch
deleted file mode 100644
index 8fb602000335..000000000000
--- a/app-misc/ddccontrol/files/ddccontrol-0.4.2-pciutils-libz.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/ddccontrol/ddccontrol/configure.ac,v
-retrieving revision 1.40
-diff -u -r1.40 configure.ac
---- configure.ac 26 Jul 2006 22:02:15 -0000 1.40
-+++ configure.ac 1 Mar 2007 14:49:35 -0000
-@@ -101,7 +101,10 @@
- DDCPCI=
- if test x$support_ddcpci = xyes; then
- AC_CHECK_HEADERS([pci/pci.h], [], [AC_MSG_ERROR([PCI utils headers not found, please install pci-utils.], [1])], [])
-- AC_CHECK_LIB([pci], [pci_alloc], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])])
-+ AC_CHECK_LIB([pci], [pci_alloc], [], [
-+ AC_CHECK_LIB([z], [gzopen], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])])
-+ AC_CHECK_LIB([pci], [pci_fill_info], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])], [-lz])
-+ ])
- DDCPCI=ddcpci
- AC_DEFINE_UNQUOTED(HAVE_DDCPCI, 1, [Define if ddccontrol is built with ddcpci support.])
- fi
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.4.2-support-fglrx.patch b/app-misc/ddccontrol/files/ddccontrol-0.4.2-support-fglrx.patch
deleted file mode 100644
index 565d1928fdd7..000000000000
--- a/app-misc/ddccontrol/files/ddccontrol-0.4.2-support-fglrx.patch
+++ /dev/null
@@ -1,606 +0,0 @@
-Source: http://sourceforge.net/mailarchive/message.php?msg_id=30201548
-Author: Vitaly V. BUrsov (vitaly@bursov.com)
-Date: 2013-01-16
-
-diff --git a/src/lib/amd_adl.c b/src/lib/amd_adl.c
-new file mode 100644
-index 0000000..40ca909
---- /dev/null
-+++ b/src/lib/amd_adl.c
-@@ -0,0 +1,306 @@
-+/*
-+ ddc/ci interface functions header
-+ Copyright(c) 2012 Vitaly V. Bursov (vitaly@bursov.com)
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+*/
-+
-+#include "config.h"
-+
-+#ifdef HAVE_AMDADL
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <fcntl.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <stdint.h>
-+#include <dlfcn.h>
-+
-+#define MAX_DISPLAYS (64)
-+
-+#ifndef LINUX
-+#define LINUX /* not Windows */
-+#endif
-+#include <ADL/adl_sdk.h>
-+
-+#include "amd_adl.h"
-+#include "ddcci.h"
-+
-+#if 1
-+# define D(x)
-+#else
-+# define D(x) x
-+#endif
-+
-+struct adl_state {
-+ int initialized;
-+
-+ void *lib;
-+
-+ int (*ADL_Main_Control_Create)(ADL_MAIN_MALLOC_CALLBACK, int );
-+ int (*ADL_Main_Control_Destroy)();
-+
-+ int (*ADL_Adapter_NumberOfAdapters_Get)(int *lpNumAdapters);
-+ int (*ADL_Adapter_AdapterInfo_Get)(LPAdapterInfo lpInfo, int iInputSize);
-+ int (*ADL_Display_NumberOfDisplays_Get)(int iAdapterIndex, int *lpNumDisplays);
-+ int (*ADL_Display_DisplayInfo_Get)(int iAdapterIndex, int *lpNumDisplays, ADLDisplayInfo **lppInfo, int iForceDetect);
-+ int (*ADL_Display_DDCBlockAccess_Get)(int iAdapterIndex, int iDisplayIndex, int iOption, int iCommandIndex, int iSendMsgLen, char *lpucSendMsgBuf, int *lpulRecvMsgLen, char *lpucRecvMsgBuf);
-+
-+ struct _displays {
-+ int adapter_index;
-+ int display_index;
-+ } displays[MAX_DISPLAYS];
-+ int displays_count;
-+};
-+
-+static struct adl_state *adl;
-+
-+static void* __stdcall adl_malloc (int size)
-+{
-+ void* buffer = malloc (size);
-+ if (buffer)
-+ memset(buffer, 0, size);
-+ return buffer;
-+}
-+
-+static void __stdcall adl_free ( void **buffer )
-+{
-+ if (*buffer != NULL) {
-+ free (*buffer);
-+ *buffer = NULL;
-+ }
-+}
-+
-+int amd_adl_get_displays_count()
-+{
-+ if (!adl->initialized)
-+ return -1;
-+
-+ return adl->displays_count;
-+}
-+
-+int amd_adl_get_display(int idx, int *adapter, int *display)
-+{
-+ if (!adl->initialized)
-+ return -1;
-+
-+ if (idx < 0 || idx >= adl->displays_count)
-+ return -1;
-+
-+ if (adapter)
-+ *adapter = adl->displays[idx].adapter_index;
-+ if (display)
-+ *display = adl->displays[idx].display_index;
-+
-+ return 0;
-+}
-+
-+int amd_adl_check_display(int adapter, int display)
-+{
-+ int i;
-+
-+ if (!adl->initialized)
-+ return -1;
-+
-+ for (i=0;i<adl->displays_count;i++){
-+ if (adl->displays[i].adapter_index == adapter &&
-+ adl->displays[i].display_index == display)
-+ return 0;
-+ }
-+ return -1;
-+}
-+
-+int amd_adl_i2c_read(int adapter, int display, unsigned int addr, unsigned char *buf, unsigned int len)
-+{
-+ int res;
-+ char wbuf = addr << 1 | 1;
-+
-+ res = adl->ADL_Display_DDCBlockAccess_Get(adapter, display, 0, 0, 1, &wbuf, (int*)&len, (char*)buf);
-+
-+ D(fprintf(stderr, " >>>>>>>> adl i2c r on %d:%d a %x l %d err %d\n", adapter, display, addr, len, res));
-+
-+ if (res != ADL_OK){
-+ return -1;
-+ }
-+
-+ return len;
-+}
-+
-+int amd_adl_i2c_write(int adapter, int display, unsigned int addr, unsigned char *buf, unsigned int len)
-+{
-+ int res, rlen;
-+ char *wbuf = alloca(len+1);
-+
-+ wbuf[0] = addr << 1;
-+ memcpy(&wbuf[1], buf, len);
-+
-+ rlen = 0;
-+ res = adl->ADL_Display_DDCBlockAccess_Get(adapter, display, 0, 0, len+1, wbuf, &rlen, NULL);
-+
-+ D(fprintf(stderr, " >>>>>>>> adl i2c w on %d:%d a %x l %d err %d\n", adapter, display, addr, len, res));
-+
-+ if (res != ADL_OK){
-+ return -1;
-+ }
-+
-+ return len;
-+}
-+
-+
-+int amd_adl_init()
-+{
-+ int i;
-+ int res;
-+ int adapters_count;
-+ AdapterInfo *adapter_info;
-+
-+ adl = adl_malloc(sizeof(struct adl_state));
-+
-+ if (!adl){
-+ fprintf(stderr, "ADL error: malloc failed\n");
-+ return 0;
-+ }
-+
-+ adl->lib = dlopen("libatiadlxx.so", RTLD_LAZY|RTLD_GLOBAL);
-+ if (!adl->lib){
-+ if (get_verbosity())
-+ perror("ADL error: dlopen() failed\n");
-+ return 0;
-+ }
-+#define LOADFUNC(_n_) \
-+ do { \
-+ adl->_n_ = dlsym(adl->lib, #_n_); \
-+ if (!adl->_n_) { \
-+ fprintf(stderr, "ADL error: loading symbol %s\n", #_n_); \
-+ return 0; \
-+ } \
-+ } while (0)
-+
-+ LOADFUNC(ADL_Main_Control_Create);
-+ LOADFUNC(ADL_Main_Control_Destroy);
-+
-+ LOADFUNC(ADL_Adapter_NumberOfAdapters_Get);
-+ LOADFUNC(ADL_Adapter_AdapterInfo_Get);
-+ LOADFUNC(ADL_Display_NumberOfDisplays_Get);
-+ LOADFUNC(ADL_Display_DisplayInfo_Get);
-+ LOADFUNC(ADL_Display_DDCBlockAccess_Get);
-+
-+#undef LOADFUNC
-+
-+ res = adl->ADL_Main_Control_Create(adl_malloc, 1); // retrieve adapter information only for adapters that are physically present and enabled
-+
-+ if (res != ADL_OK){
-+ if (get_verbosity())
-+ fprintf(stderr, "Failed to initialize ADL: %d\n", res);
-+ return 0;
-+ }
-+
-+ res = adl->ADL_Adapter_NumberOfAdapters_Get(&adapters_count);
-+ if (res != ADL_OK){
-+ if (get_verbosity())
-+ fprintf(stderr, "Failed to get number of ADL adapters: %d\n", res);
-+ return 0;
-+ }
-+
-+ if (adapters_count < 1){
-+ if (get_verbosity())
-+ fprintf(stderr, "No ADL adapters found.\n");
-+ return 0;
-+ }
-+
-+ adapter_info = adl_malloc(sizeof(AdapterInfo) * adapters_count);
-+ if (!adapter_info){
-+ fprintf(stderr, "ADL error: malloc failed\n");
-+ return 0;
-+ }
-+
-+ res = adl->ADL_Adapter_AdapterInfo_Get(adapter_info, sizeof(AdapterInfo) * adapters_count);
-+ if (res != ADL_OK){
-+ fprintf(stderr, "Failed to get ADL adapters info: %d\n", res);
-+ return 0;
-+ }
-+
-+ for (i=0;i<adapters_count;i++){
-+ int aidx = adapter_info[i].iAdapterIndex;
-+ int numdisplays;
-+ int j;
-+ ADLDisplayInfo *display_info;
-+
-+ if (adl->ADL_Display_DisplayInfo_Get(aidx, &numdisplays, &display_info, 0) != ADL_OK)
-+ continue;
-+
-+ D(printf("\t ================================\n"));
-+ D(printf("\t %d: %s - %s %d %x:%x.%x %s\n", adapter_info[i].iAdapterIndex, adapter_info[i].strAdapterName, adapter_info[i].strDisplayName,
-+ adapter_info[i].iPresent,
-+ adapter_info[i].iBusNumber,
-+ adapter_info[i].iDeviceNumber,
-+ adapter_info[i].iFunctionNumber,
-+ adapter_info[i].strUDID));
-+
-+ for (j=0;j<numdisplays;j++){
-+ int didx;
-+
-+ if ((display_info[j].iDisplayInfoValue & ADL_DISPLAY_DISPLAYINFO_DISPLAYCONNECTED) &&
-+ (display_info[j].iDisplayInfoValue & ADL_DISPLAY_DISPLAYINFO_DISPLAYMAPPED)){
-+
-+ didx = display_info[j].displayID.iDisplayLogicalIndex;
-+
-+ D(printf("\t\t found display %s at %d:%d\n",
-+ display_info[j].strDisplayName, aidx, didx));
-+
-+ adl->displays[adl->displays_count].adapter_index = aidx;
-+ adl->displays[adl->displays_count].display_index = didx;
-+ adl->displays_count++;
-+ if (adl->displays_count >= MAX_DISPLAYS){
-+ break;
-+ }
-+ }
-+ }
-+
-+ adl_free((void**)&display_info);
-+
-+ if (adl->displays_count >= MAX_DISPLAYS){
-+ break;
-+ }
-+ }
-+
-+ adl_free((void**)&adapter_info);
-+
-+ D(fprintf(stderr, "adl initialized, %d displays\n", adl->displays_count));
-+
-+ adl->initialized = 1;
-+ return 1;
-+}
-+
-+void amd_adl_free()
-+{
-+ if (!adl)
-+ return;
-+
-+ adl->ADL_Main_Control_Destroy();
-+
-+ if (adl->lib){
-+ dlclose(adl->lib);
-+ adl->lib = NULL;
-+ }
-+
-+ adl_free((void**)&adl);
-+}
-+
-+#endif /* HAVE_AMDADL */
-+
-diff --git a/src/lib/amd_adl.h b/src/lib/amd_adl.h
-new file mode 100644
-index 0000000..d6c7bc1
---- /dev/null
-+++ b/src/lib/amd_adl.h
-@@ -0,0 +1,33 @@
-+/*
-+ ddc/ci interface functions header
-+ Copyright(c) 2012 Vitaly V. Bursov (vitaly@bursov.com)
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+*/
-+
-+#ifndef AMD_ADL_H
-+#define AMD_ADL_H
-+
-+int amd_adl_init();
-+void amd_adl_free();
-+
-+int amd_adl_get_displays_count();
-+int amd_adl_get_display(int idx, int *adapter, int *display);
-+int amd_adl_check_display(int adapter, int display);
-+
-+int amd_adl_i2c_read(int adapter, int display, unsigned int addr, unsigned char *buf, unsigned int len);
-+int amd_adl_i2c_write(int adapter, int display, unsigned int addr, unsigned char *buf, unsigned int len);
-+
-+#endif /* AMD_ADL_H */
-diff --git a/src/lib/ddcci.c b/src/lib/ddcci.c
-index 4492df5..186d597 100644
---- a/src/lib/ddcci.c
-+++ b/src/lib/ddcci.c
-@@ -38,6 +38,7 @@
- #include <sys/stat.h>
-
- #include "ddcci.h"
-+#include "amd_adl.h"
-
- #include "conf.h"
-
-@@ -239,12 +240,22 @@ int ddcci_init(char* usedatadir)
- printf(_("Failed to initialize ddccontrol database...\n"));
- return 0;
- }
-+#ifdef HAVE_AMDADL
-+ if (!amd_adl_init()){
-+ if (verbosity) {
-+ printf(_("Failed to initialize ADL...\n"));
-+ }
-+ }
-+#endif
- return ddcpci_init();
- }
-
- void ddcci_release() {
- ddcpci_release();
- ddcci_release_db();
-+#ifdef HAVE_AMDADL
-+ amd_adl_free();
-+#endif
- }
-
- /* write len bytes (stored in buf) to i2c address addr */
-@@ -318,6 +329,12 @@ static int i2c_write(struct monitor* mon, unsigned int addr, unsigned char *buf,
- return adata.status;
- }
- #endif
-+#ifdef HAVE_AMDADL
-+ case type_adl:
-+ {
-+ return amd_adl_i2c_write(mon->adl_adapter, mon->adl_display, addr, buf, len);
-+ }
-+#endif
- default:
- return -1;
- }
-@@ -396,6 +413,12 @@ static int i2c_read(struct monitor* mon, unsigned int addr, unsigned char *buf,
- return ret - ANSWER_SIZE;
- }
- #endif
-+#ifdef HAVE_AMDADL
-+ case type_adl:
-+ {
-+ return amd_adl_i2c_read(mon->adl_adapter, mon->adl_display, addr, buf, len);
-+ }
-+#endif
- default:
- return -1;
- }
-@@ -929,6 +952,23 @@ static int ddcci_open_with_addr(struct monitor* mon, const char* filename, int a
- mon->type = pci;
- }
- #endif
-+#ifdef HAVE_AMDADL
-+ else if (strncmp(filename, "adl:", 4) == 0) {
-+ mon->adl_adapter = -1;
-+ mon->adl_display = -1;
-+ if (sscanf(filename, "adl:%d:%d", &mon->adl_adapter, &mon->adl_display) != 2){
-+ fprintf(stderr, _("Invalid filename (%s).\n"), filename);
-+ return -3;
-+ }
-+
-+ if (amd_adl_check_display(mon->adl_adapter, mon->adl_display)){
-+ fprintf(stderr, _("ADL display not found (%s).\n"), filename);
-+ return -3;
-+ }
-+
-+ mon->type = type_adl;
-+ }
-+#endif
- else {
- fprintf(stderr, _("Invalid filename (%s).\n"), filename);
- return -3;
-@@ -1167,6 +1207,28 @@ struct monitorlist* ddcci_probe() {
-
- closedir(dirp);
-
-+#ifdef HAVE_AMDADL
-+ /* ADL probe */
-+ int adl_disp;
-+
-+ for (adl_disp=0; adl_disp<amd_adl_get_displays_count(); adl_disp++){
-+ int adapter, display;
-+ if (amd_adl_get_display(adl_disp, &adapter, &display))
-+ break;
-+
-+ filename = malloc(64);
-+ snprintf(filename, 64, "adl:%d:%d", adapter, display);
-+ if (verbosity) {
-+ printf(_("Found ADL display (%s)\n"), filename);
-+ }
-+ ddcci_probe_device(filename, &current, &last);
-+ if (!verbosity) {
-+ printf(".");
-+ fflush(stdout);
-+ }
-+ }
-+#endif
-+
- if (!verbosity)
- printf("\n");
-
-diff --git a/src/lib/ddcci.h b/src/lib/ddcci.h
-index c058051..cac907b 100644
---- a/src/lib/ddcci.h
-+++ b/src/lib/ddcci.h
-@@ -63,6 +63,9 @@ struct caps {
- struct monitor {
- int fd;
- unsigned int addr;
-+#ifdef HAVE_AMDADL
-+ int adl_adapter, adl_display;
-+#endif
- char pnpid[8];
- unsigned char digital; /* 0 - digital, 1 - analog */
- struct timeval last;
-@@ -76,6 +79,9 @@ struct monitor {
- #ifdef HAVE_DDCPCI
- ,pci
- #endif
-+#ifdef HAVE_AMDADL
-+ ,type_adl
-+#endif
- } type;
- int probing; /* are we probing? */
- diff --git a/configure.ac b/configure.ac
-index 8ee47f3..79e831e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -112,6 +112,39 @@ fi
-
- AC_SUBST([DDCPCI])
-
-+# AMD ADL support check
-+support_amdadl=
-+AC_ARG_ENABLE(amdadl,
-+ [ --enable-amdadl enable AMD Display Library support (autodetect) ],
-+ [if test x$enableval = xno; then
-+ support_amdadl=no
-+ else
-+ support_amdadl=yes
-+ fi])
-+
-+AMDADL=
-+if test x$support_amdadl = xyes; then
-+ AC_CHECK_HEADERS([ADL/adl_sdk.h], [], [AC_MSG_ERROR([ADL headers not found, but ADL support requested.], [1])],
-+ [#ifndef __stdcall
-+ #define __stdcall
-+ #endif
-+ ])
-+ AMDADL=amdadl
-+elif test x$support_amdadl = x; then
-+ AC_CHECK_HEADERS([ADL/adl_sdk.h], [
-+ AMDADL=amdadl
-+ ], [], [#ifndef __stdcall
-+ #define __stdcall
-+ #endif
-+ ])
-+fi
-+
-+if test x$AMDADL = xamdadl; then
-+ AC_DEFINE_UNQUOTED(HAVE_AMDADL, 1, [Define if ddccontrol is built with ADL support.])
-+fi
-+
-+AC_SUBST([AMDADL])
-+
- # Gnome check
- support_gnome=yes
- AC_ARG_ENABLE(gnome,
-diff --git a/src/config.h.in b/src/config.h.in
-index 971ec71..e0f31c6 100644
---- a/src/config.h.in
-+++ b/src/config.h.in
-@@ -4,6 +4,12 @@
- language is requested. */
- #undef ENABLE_NLS
-
-+/* Define to 1 if you have the <ADL/adl_sdk.h> header file. */
-+#undef HAVE_ADL_ADL_SDK_H
-+
-+/* Define if ddccontrol is built with ADL support. */
-+#undef HAVE_AMDADL
-+
- /* Define if linux/i2c-dev.h is buggy on your system, so defaults constants
- and structures must be used */
- #undef HAVE_BUGGY_I2C_DEV
-@@ -41,7 +47,7 @@
- /* Define if ddccontrol is built with /dev/i2c-* support. */
- #undef HAVE_I2C_DEV
-
--/* Define if you have the iconv() function. */
-+/* Define if you have the iconv() function and it works. */
- #undef HAVE_ICONV
-
- /* Define to 1 if you have the <inttypes.h> header file. */
-@@ -50,6 +56,9 @@
- /* Define to 1 if you have the `pci' library (-lpci). */
- #undef HAVE_LIBPCI
-
-+/* Define to 1 if you have the `z' library (-lz). */
-+#undef HAVE_LIBZ
-+
- /* Define to 1 if you have the <linux/types.h> header file. */
- #undef HAVE_LINUX_TYPES_H
-
-@@ -89,6 +98,10 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+ */
-+#undef LT_OBJDIR
-+
- /* Name of package */
- #undef PACKAGE
-
-@@ -104,6 +117,9 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
-
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
-
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index ce18dcf..775629e 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -11,6 +11,7 @@ $(pkgconfig_DATA): $(srcdir)/ddccontrol.pc.in $(top_builddir)/config.status
- lib_LTLIBRARIES = libddccontrol.la
-
- libddccontrol_la_SOURCES = ddcci.c ddcci.h monitor_db.c monitor_db.h \
-- ddcpci-ipc.h i2c-dev.h conf.c conf.h
-+ ddcpci-ipc.h i2c-dev.h conf.c conf.h amd_adl.c amd_adl.h
-+
- libddccontrol_la_LIBADD = $(LIBXML2_LDFLAGS)
- AM_CFLAGS = $(LIBXML2_CFLAGS)